Third (and hopefully last) EFL revamp before I hand over maintainership to

Justin Patrin. We now have a efl.bbclass that contains common code for the
various libraries. This makes it possible to have very clean and concise bb's.

69 files changed, 226 insertions, 488 deletions

diff --git a/packages/curl/curl-native_7.14.0.bb b/packages/curl/curl-native_7.14.0.bb
index 0fc2e14452..59af4ef32e 100644
--- a/packages/curl/curl-native_7.14.0.bb
+++ b/packages/curl/curl-native_7.14.0.bb
@@ -1,6 +1,12 @@
 include curl_${PV}.bb
 inherit native
 
+do_stage () {
+        install -d ${STAGING_INCDIR}/curl
+        install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
+        oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
+}
+
 do_install() {
 	:
 }
diff --git a/packages/edb/.mtn2git_empty b/packages/edb/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/edb/.mtn2git_empty
+++ /dev/null
diff --git a/packages/edb/edb-native_1.0.5.004.bb b/packages/edb/edb-native_1.0.5.004.bb
deleted file mode 100644
index 59cb8da587..0000000000
--- a/packages/edb/edb-native_1.0.5.004.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-include edb_${PV}.bb
-inherit native
-DEPENDS = "zlib-native"
-
-do_stage () {
-	install -m 0755 tools/.libs/edb_ed ${STAGING_BINDIR}
-	oe_libinstall -C src libedb ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/Edb.h ${STAGING_INCDIR}/
-}
-
-do_install() {
-	:
-}
-
diff --git a/packages/edb/edb_1.0.5.004.bb b/packages/edb/edb_1.0.5.004.bb
deleted file mode 100644
index d6204b289f..0000000000
--- a/packages/edb/edb_1.0.5.004.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "EDB is a database convenience library wrapped around the \
-Berkeley DB 2.7.7 by Sleepycat Software."
-HOMEPAGE = "http://www.enlightenment.org"
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = "zlib"
-LICENSE = "BSD"
-PR = "r0"
-
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-  
-SRC_URI = "http://enlightenment.freedesktop.org/files/edb-${PV}.tar.gz"
-S = "${WORKDIR}/edb-${PV}"
-  
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--disable-gtk \
-		--disable-ncurses"
-
-do_stage () {
-  oe_libinstall -C src libedb ${STAGING_LIBDIR}/
-  install -m 0644 ${S}/src/Edb.h ${STAGING_INCDIR}/
-}
-
-FILES_${PN} = "${libdir}/libedb*.so*"
-FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig"
-
diff --git a/packages/edje/.mtn2git_empty b/packages/edje/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/edje/.mtn2git_empty
+++ /dev/null
diff --git a/packages/edje/edje_0.5.0.013.bb b/packages/edje/edje_0.5.0.013.bb
deleted file mode 100644
index 3730fbcf94..0000000000
--- a/packages/edje/edje_0.5.0.013.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Edje is a complex graphical design & layout library."
-DEPENDS = "freetype virtual/evas virtual/ecore embryo eet edb edje-native"
-LICENSE = "MIT"
-HOMEPAGE = "http://www.enlightenment.org"
-SECTION = "e/libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r0"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/edje-${PV}.tar.gz"
-S = "${WORKDIR}/edje-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--disable-edje-cc \
-		--enable-fb-only"
-
-LEAD_SONAME = "libedje.so"
-
-do_stage () {
-	oe_libinstall -C src/lib libedje ${STAGING_LIBDIR}/
-	oe_libinstall -C src/lib libedje_edit ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Edje.h ${STAGING_INCDIR}/
-}
-
-BINARIES = "edje edje_ls edje_test edje_cc edje_decc edje_thumb"
-
-PACKAGES += "edje-examples"
-
-FILES_${PN} = "${libdir}/libedje*.so*"
-FILES_${PN}-dev += "${bindir}/edje-config ${bindir}/edje_ls ${bindir}/edje_cc ${bindir}/edje_decc ${bindir}/edje_thumb ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/edje ${bindir}/edje_test ${datadir}"
diff --git a/packages/eet/.mtn2git_empty b/packages/eet/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/eet/.mtn2git_empty
+++ /dev/null
diff --git a/packages/eet/eet-native_0.9.10.013.bb b/packages/eet/eet-native_0.9.10.013.bb
deleted file mode 100644
index 81f0a349fa..0000000000
--- a/packages/eet/eet-native_0.9.10.013.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PRIORITY = "optional"
-include eet_${PV}.bb
-inherit native
-DEPENDS = "zlib-native jpeg-native"
-LICENSE = "BSD"
-
-do_stage () {
-	install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR}
-	oe_libinstall -C src/lib libeet ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Eet.h ${STAGING_INCDIR}/
-}
-
-do_install() {
-	:
-}
diff --git a/packages/eet/eet_0.9.10.013.bb b/packages/eet/eet_0.9.10.013.bb
deleted file mode 100644
index c2a7296706..0000000000
--- a/packages/eet/eet_0.9.10.013.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "EET is a tiny library designed to write an \
-arbitary set of chunks of data to a file and optionally compress \
-each chunk (very much like a zip file) and allow fast \
-random-access reading of the file later on."
-HOMEPAGE = "http://www.enlightenment.org"
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = "zlib jpeg"
-PR = "r0"
-LICENSE = "BSD"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/eet-${PV}.tar.gz"
-S = "${WORKDIR}/eet-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-do_stage () {
-	oe_libinstall -C src/lib libeet ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Eet.h ${STAGING_INCDIR}/
-}
-
-FILES_${PN} = "${libdir}/libeet*.so*"
-FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig"
diff --git a/packages/ecore/.mtn2git_empty b/packages/efl/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ecore/.mtn2git_empty
+++ b/packages/efl/.mtn2git_empty
diff --git a/packages/ecore/ecore-fb_0.9.9.013.bb b/packages/efl/ecore-fb_0.9.9.013.bb
index f52c0a2f2b..152cd5c4fd 100644
--- a/packages/ecore/ecore-fb_0.9.9.013.bb
+++ b/packages/efl/ecore-fb_0.9.9.013.bb
@@ -1,4 +1,4 @@
-include ecore_${PV}.inc
+include ecore.inc
 PR = "r0"
 
 EXTRA_OECONF = "--enable-ecore-fb \
diff --git a/packages/ecore/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb
index 4ead109e00..a90f508004 100644
--- a/packages/ecore/ecore-native_0.9.9.013.bb
+++ b/packages/efl/ecore-native_0.9.9.013.bb
@@ -6,17 +6,4 @@ export CURL_CONFIG = "${STAGING_BINDIR}/curl-config-native"
 export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config-native"
 export EDB_CONFIG = "${STAGING_BINDIR}/edb-config-native"
 export EET_CONFIG = "${STAGING_BINDIR}/eet-config-native"
-
-do_stage () {
-	for p in ${parts}; do
-		dir=`echo $p|tr A-Z a-z`
-		install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/
-		oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/
-	done
-	install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-do_install() {
-	:
-}
+export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config-native"
diff --git a/packages/ecore/ecore-x11_0.9.9.013.bb b/packages/efl/ecore-x11_0.9.9.013.bb
index 9e7389c8ad..b21efb588e 100644
--- a/packages/ecore/ecore-x11_0.9.9.013.bb
+++ b/packages/efl/ecore-x11_0.9.9.013.bb
@@ -1,4 +1,4 @@
-include ecore_${PV}.inc
+include ecore.inc
 DEPENDS += "evas-x11"
 PR = "r1"
 
@@ -22,5 +22,3 @@ parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \
 	 Ecore_Txt Ecore_Fb Ecore_Con \
 	 Ecore_Ipc Ecore_Evas Ecore_Config \
 	 Ecore_X"
-
-export x_cflags = ""
diff --git a/packages/ecore/ecore_0.9.9.013.inc b/packages/efl/ecore.inc
index 4598b20a4f..a8ef0ec982 100644
--- a/packages/ecore/ecore_0.9.9.013.inc
+++ b/packages/efl/ecore.inc
@@ -1,26 +1,24 @@
 DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \
 foundation libraries. It makes makes doing selections, drag and drop, event loops, \
 timeouts and idle handlers fast, optimized, and convenient."
-HOMEPAGE = "http://www.enlightenment.org"
-SECTION = "e/libs"
-PRIORITY = "optional"
 LEAD_SONAME = "libecore.so"
 PROVIDES = "virtual/ecore"
 LICENSE = "MIT"
 DEPENDS = "curl edb eet virtual/evas freetype edb-native"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+
+inherit efl
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \
-           file://fix-configure.patch;patch=1"
+           file://ecore-configure.patch;patch=1"
 S = "${WORKDIR}/ecore-${PV}"
 
-inherit autotools binconfig
-
 EXTRA_OECONF = "<override me>"
 
+libraries = ""
+headers = ""
 parts = "<override me>"
 
-do_stage () {
+do_stage_append() {
 	for p in ${parts}; do
 		dir=`echo $p|tr A-Z a-z`
 		install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/
@@ -30,9 +28,4 @@ do_stage () {
 	install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
 }
 
-PACKAGES =+ "ecore-examples ecore-config"
-
-FILES_${PN} = "${libdir}/libecore*.so* ${libdir}/ecore_config_ipc_ecore.so"
-FILES_${PN}-dev += "${bindir}/ecore-config ${libdir}/pkgconfig"
-FILES_ecore-config = "${bindir}/ecore_config"
-FILES_ecore-examples = "${bindir}/ecore_test ${bindir}/ecore_evas_test ${datadir}"
+FILES_${PN} += "${libdir}/libecore*.so* ${libdir}/ecore_config_ipc_ecore.so"
diff --git a/packages/efl/edb-native_1.0.5.004.bb b/packages/efl/edb-native_1.0.5.004.bb
new file mode 100644
index 0000000000..234b0e05e5
--- /dev/null
+++ b/packages/efl/edb-native_1.0.5.004.bb
@@ -0,0 +1,7 @@
+include edb_${PV}.bb
+inherit native
+DEPENDS = "zlib-native"
+
+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
new file mode 100644
index 0000000000..2dace0cb07
--- /dev/null
+++ b/packages/efl/edb_1.0.5.004.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "EDB is a database convenience library wrapped around the \
+Berkeley DB 2.7.7 by Sleepycat Software."
+DEPENDS = "zlib"
+LICENSE = "BSD"
+PR = "r0"
+
+inherit efl
+
+EXTRA_OECONF = "--disable-gtk --disable-ncurses"
+
+libdirectory = "src"
+
diff --git a/packages/edje/edje-native_0.5.0.013.bb b/packages/efl/edje-native_0.5.0.013.bb
index dd0ca2b593..8f15b4edab 100644
--- a/packages/edje/edje-native_0.5.0.013.bb
+++ b/packages/efl/edje-native_0.5.0.013.bb
@@ -10,14 +10,13 @@ EXTRA_OECONF = "--with-fb-only \
   --with-embryo-config=${STAGING_BINDIR}/embryo-config-native	\
   --with-imlib2-config=${STAGING_BINDIR}/imlib2-config-native	"
 
-do_stage() {
+do_configure_prepend() {
+        sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
+}
+
+do_stage_append() {
 	for i in ${BINARIES}
 	do
-		install -m 0755 src/bin/$i ${STAGING_BINDIR}
+		${HOST_SYS}-libtool --mode=install install -m 0755 src/bin/$i ${STAGING_BINDIR}
 	done
 }
-
-do_install() {
-	:
-}
-
diff --git a/packages/efl/edje_0.5.0.013.bb b/packages/efl/edje_0.5.0.013.bb
new file mode 100644
index 0000000000..40c2002860
--- /dev/null
+++ b/packages/efl/edje_0.5.0.013.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Edje is a complex graphical design & layout library."
+DEPENDS = "freetype virtual/evas virtual/ecore embryo eet edb edje-native"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit efl
+
+EXTRA_OECONF = "--disable-edje-cc --enable-fb-only"
+LEAD_SONAME = "libedje.so"
+
+libraries += "libedje_edit"
+
+BINARIES = "edje edje_ls edje_test edje_cc edje_decc edje_thumb"
diff --git a/packages/efl/eet-native_0.9.10.013.bb b/packages/efl/eet-native_0.9.10.013.bb
new file mode 100644
index 0000000000..fa20c9fb30
--- /dev/null
+++ b/packages/efl/eet-native_0.9.10.013.bb
@@ -0,0 +1,7 @@
+include eet_${PV}.bb
+inherit native
+DEPENDS = "zlib-native jpeg-native"
+
+do_stage_append() {
+	install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR}
+}
diff --git a/packages/efl/eet_0.9.10.013.bb b/packages/efl/eet_0.9.10.013.bb
new file mode 100644
index 0000000000..5820b910d9
--- /dev/null
+++ b/packages/efl/eet_0.9.10.013.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "EET is a tiny library designed to write an \
+arbitary set of chunks of data to a file and optionally compress \
+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 = "r0"
+
+inherit efl
diff --git a/packages/efl/embryo-native_0.9.1.013.bb b/packages/efl/embryo-native_0.9.1.013.bb
new file mode 100644
index 0000000000..ba24e954bc
--- /dev/null
+++ b/packages/efl/embryo-native_0.9.1.013.bb
@@ -0,0 +1,6 @@
+include embryo_${PV}.bb
+inherit native
+
+do_stage_append() {
+	${HOST_SYS}-libtool --mode=install install -m 0755 src/bin/embryo_cc ${STAGING_BINDIR}
+}
diff --git a/packages/efl/embryo_0.9.1.013.bb b/packages/efl/embryo_0.9.1.013.bb
new file mode 100644
index 0000000000..ee193e5c4d
--- /dev/null
+++ b/packages/efl/embryo_0.9.1.013.bb
@@ -0,0 +1,10 @@
+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 = "r0"
+
+inherit efl
+
diff --git a/packages/efl/emotion_0.0.1.004.bb b/packages/efl/emotion_0.0.1.004.bb
new file mode 100644
index 0000000000..9fe32ce26b
--- /dev/null
+++ b/packages/efl/emotion_0.0.1.004.bb
@@ -0,0 +1,5 @@
+DESCRIPTION = "Emotion is a multimedia library based on libxine"
+LICENSE = "MIT"
+DEPENDS = "libxine"
+
+inherit efl
diff --git a/packages/efl/epeg_0.9.0.004.bb b/packages/efl/epeg_0.9.0.004.bb
new file mode 100644
index 0000000000..c35ec63606
--- /dev/null
+++ b/packages/efl/epeg_0.9.0.004.bb
@@ -0,0 +1,5 @@
+DESCRIPTION = "Epeg is a small library for handling thumbnails."
+LICENSE = "MIT"
+DEPENDS = "jpeg"
+
+inherit efl
diff --git a/packages/efl/epsilon_0.3.0.004.bb b/packages/efl/epsilon_0.3.0.004.bb
new file mode 100644
index 0000000000..d8dc08e11f
--- /dev/null
+++ b/packages/efl/epsilon_0.3.0.004.bb
@@ -0,0 +1,8 @@
+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"
+
+inherit efl
+
+SRC_URI += "file://compile-fix.patch;patch=1"
diff --git a/packages/efl/esmart_0.9.0.004.bb b/packages/efl/esmart_0.9.0.004.bb
new file mode 100644
index 0000000000..781442201b
--- /dev/null
+++ b/packages/efl/esmart_0.9.0.004.bb
@@ -0,0 +1,35 @@
+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"
+PR = "r1"
+
+inherit efl
+
+SRC_URI += "file://compile-fix.patch;patch=1"
+
+myheaders = "esmart_container/Esmart_Container.h \
+             esmart_draggies/Esmart_Draggies.h \
+             esmart_file_dialog/Esmart_File_Dialog.h \
+             esmart_text_entry/Esmart_Text_Entry.h \
+             esmart_textarea/Esmart_Textarea.h \
+             esmart_thumb/Esmart_Thumb.h \
+             esmart_trans_x11/Esmart_Trans_X11.h"
+
+mylibraries = "esmart_container \
+               esmart_draggies \
+               esmart_file_dialog \
+               esmart_text_entry \
+               esmart_textarea \
+               esmart_thumb \
+               esmart_trans_x11"
+
+do_stage_append() {
+	install -d ${STAGING_INCDIR}/Esmart/
+	for i in ${headers}; do
+		install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/Esmart/
+	done
+	oe_libinstall -C src/lib libsmart ${STAGING_LIBDIR}/
+	for i in ${mylibraries}; do
+		oe_libinstall -C src/lib/$i lib$i ${STAGING_LIBDIR}/
+	done
+}
diff --git a/packages/efl/etox_0.9.0.004.bb b/packages/efl/etox_0.9.0.004.bb
new file mode 100644
index 0000000000..26edf1c0a4
--- /dev/null
+++ b/packages/efl/etox_0.9.0.004.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Etox is a type setting and text layout library based on Evas. \
+Etox helps you when it comes to displaying, moving, resizing, layering, \
+clipping, aligning and coloring fonts in different styles, and more."
+DEPENDS = "edb virtual/evas virtual/ecore"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit efl
+
+libdirectory = "src"
diff --git a/packages/evas/evas-fb_0.9.9.013.bb b/packages/efl/evas-fb_0.9.9.013.bb
index ba0d4c7675..2a9a02e1ca 100644
--- a/packages/evas/evas-fb_0.9.9.013.bb
+++ b/packages/efl/evas-fb_0.9.9.013.bb
@@ -1,4 +1,4 @@
-include evas_${PV}.inc
+include evas.inc
 PR = "r0"
 
 EXTRA_OECONF = "--enable-fb			\
diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.013.bb
new file mode 100644
index 0000000000..e17c1b3a95
--- /dev/null
+++ b/packages/efl/evas-native_0.9.9.013.bb
@@ -0,0 +1,7 @@
+include evas-fb_${PV}.bb
+inherit native
+DEPENDS = "freetype-native"
+
+export EDB_CONFIG = "${STAGING_BINDIR}/edb-config-native"
+export EET_CONFIG = "${STAGING_BINDIR}/eet-config-native"
+export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config-native"
diff --git a/packages/evas/evas-x11_0.9.9.013.bb b/packages/efl/evas-x11_0.9.9.013.bb
index eef87843a4..68eadd6ae6 100644
--- a/packages/evas/evas-x11_0.9.9.013.bb
+++ b/packages/efl/evas-x11_0.9.9.013.bb
@@ -1,8 +1,10 @@
-include evas_${PV}.inc
+include evas.inc
 DEPENDS += "x11 xext"
 PR = "r2"
 
-EXTRA_OECONF = "--enable-fb			\
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
+		--x-libraries=${STAGING_LIBDIR} \
+		--enable-fb			\
 		--disable-directfb		\
 		--disable-buffer		\
 		--disable-software-qtopia	\
@@ -46,3 +48,4 @@ headers = "Evas_Engine_Software_X11.h \
            Evas_Engine_Buffer.h \
            Evas_Engine_FB.h \
            Evas.h"
+
diff --git a/packages/evas/evas_0.9.9.013.inc b/packages/efl/evas.inc
index 31b06c99ff..6172fde192 100644
--- a/packages/evas/evas_0.9.9.013.inc
+++ b/packages/efl/evas.inc
@@ -3,20 +3,15 @@ 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"
-HOMEPAGE = "http://www.enlightenment.org"
-SECTION = "e/libs"
-PRIORITY = "optional"
 PROVIDES = "virtual/evas"
 DEPENDS = "libpng jpeg edb eet freetype"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r1"
+
+inherit efl
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
            file://pkg.m4"
 S = "${WORKDIR}/evas-${PV}"
 
-inherit autotools pkgconfig binconfig
-
 EXTRA_OECONF = "<override me>"
 
 do_configure () {
@@ -25,16 +20,5 @@ do_configure () {
 }
 
 headers = "<override me>"
+libraries = "libevas"
 
-do_stage () {
-	for i in ${headers}; do
-		install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
-	done
-	oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
-}
-
-PACKAGES =+ "evas-examples"
-
-FILES_${PN} = "${libdir}/libevas*.so*"
-FILES_${PN}-dev += "${bindir}/evas-config ${libdir}/pkgconfig"
-FILES_evas-examples = "${bindir}/evas_*_test ${datadir}"
diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.004.bb
new file mode 100644
index 0000000000..6377575120
--- /dev/null
+++ b/packages/efl/ewl_0.0.4.004.bb
@@ -0,0 +1,16 @@
+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"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit efl
+
+SRC_URI += "file://ewl-configure.patch;patch=1"
+
+export CURL_CONFIG = "${STAGING_BINDIR}/curl-config"
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
diff --git a/packages/ecore/files/.mtn2git_empty b/packages/efl/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ecore/files/.mtn2git_empty
+++ b/packages/efl/files/.mtn2git_empty
diff --git a/packages/imlib2/files/binconfig.patch b/packages/efl/files/binconfig.patch
index 9383d581cd..9383d581cd 100644
--- a/packages/imlib2/files/binconfig.patch
+++ b/packages/efl/files/binconfig.patch
diff --git a/packages/epsilon/files/compile-fix.patch b/packages/efl/files/compile-fix.patch
index 1c42cc59c4..1c42cc59c4 100644
--- a/packages/epsilon/files/compile-fix.patch
+++ b/packages/efl/files/compile-fix.patch
diff --git a/packages/epeg/files/dirs.patch b/packages/efl/files/dirs.patch
index 8b0b5281d1..8b0b5281d1 100644
--- a/packages/epeg/files/dirs.patch
+++ b/packages/efl/files/dirs.patch
diff --git a/packages/ecore/files/fix-configure.patch b/packages/efl/files/ecore-configure.patch
index abaa4e10a4..abaa4e10a4 100644
--- a/packages/ecore/files/fix-configure.patch
+++ b/packages/efl/files/ecore-configure.patch
diff --git a/packages/ewl/ewl/fix-configure.patch b/packages/efl/files/ewl-configure.patch
index a754e0f819..a754e0f819 100644
--- a/packages/ewl/ewl/fix-configure.patch
+++ b/packages/efl/files/ewl-configure.patch
diff --git a/packages/evas/files/pkg.m4 b/packages/efl/files/pkg.m4
index c80e0acfc4..c80e0acfc4 100644
--- a/packages/evas/files/pkg.m4
+++ b/packages/efl/files/pkg.m4
diff --git a/packages/imlib2/files/x.patch b/packages/efl/files/x.patch
index 98c1ec635b..98c1ec635b 100644
--- a/packages/imlib2/files/x.patch
+++ b/packages/efl/files/x.patch
diff --git a/packages/imlib2/imlib2-fb_1.2.1.004.bb b/packages/efl/imlib2-fb_1.2.1.004.bb
index bddb085fdd..09fecdaf8b 100644
--- a/packages/imlib2/imlib2-fb_1.2.1.004.bb
+++ b/packages/efl/imlib2-fb_1.2.1.004.bb
@@ -2,3 +2,4 @@ include imlib2.inc
 
 EXTRA_OECONF = "--without-x \
 		--disable-mmx"
+
diff --git a/packages/imlib2/imlib2-native_1.2.1.004.bb b/packages/efl/imlib2-native_1.2.1.004.bb
index b4310c29a5..4b4c956102 100644
--- a/packages/imlib2/imlib2-native_1.2.1.004.bb
+++ b/packages/efl/imlib2-native_1.2.1.004.bb
@@ -2,10 +2,7 @@ include imlib2.inc
 inherit native
 DEPENDS = "freetype-native libpng-native jpeg-native"
 
+export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config-native"
+
 EXTRA_OECONF = "--disable-mmx \
                 --without-x"
-
-do_install() {
-	:
-}
-
diff --git a/packages/imlib2/imlib2-x11_1.2.1.004.bb b/packages/efl/imlib2-x11_1.2.1.004.bb
index 4cec9a979f..ca74281ca2 100644
--- a/packages/imlib2/imlib2-x11_1.2.1.004.bb
+++ b/packages/efl/imlib2-x11_1.2.1.004.bb
@@ -1,8 +1,9 @@
 include imlib2.inc
 DEPENDS += "x11 xext"
 
+export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config"
+
 EXTRA_OECONF = "--disable-mmx \
                 --with-x \
                 --x-includes=${STAGING_INCDIR} \
                 --x-libraries=${STAGING_LIBDIR}"
-
diff --git a/packages/imlib2/imlib2.inc b/packages/efl/imlib2.inc
index cf73ba446f..2aa53b96a0 100644
--- a/packages/imlib2/imlib2.inc
+++ b/packages/efl/imlib2.inc
@@ -1,35 +1,37 @@
 DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation."
-HOMEPAGE = "http://www.enlightenment.org"
 LICENSE = "BSD"
-SECTION = "e/libs"
-PRIORITY = "optional"
 PROVIDES = "virtual/imlib2"
 DEPENDS = "freetype libpng jpeg"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+
+inherit efl
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/imlib2-${PV}.tar.gz"
 S = "${WORKDIR}/imlib2-${PV}"
 
-inherit autotools pkgconfig binconfig
+libraries = ""
+headers = ""
 
-do_stage () {
-	oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
+do_stage_append() {
+        oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
+        install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
 
-	install -d ${STAGING_LIBDIR}/imlib2/loaders
-	for i in src/modules/loaders/.libs/*.so
-	do
-		install -m 0755 $i ${STAGING_LIBDIR}/imlib2/loaders
-	done
+        install -d ${STAGING_LIBDIR}/imlib2/loaders
+        for i in src/modules/loaders/.libs/*.so
+        do
+                install -m 0755 $i ${STAGING_LIBDIR}/imlib2/loaders
+        done
 
-	install -d ${STAGING_LIBDIR}/imlib2/filters
-	for i in src/modules/filters/.libs/*.so
-	do
-		install -m 0755 $i ${STAGING_LIBDIR}/imlib2/filters
-	done
+        install -d ${STAGING_LIBDIR}/imlib2/filters
+        for i in src/modules/filters/.libs/*.so
+        do
+                install -m 0755 $i ${STAGING_LIBDIR}/imlib2/filters
+        done
 }
 
-do_install_append() {
+do_install() {
+        oe_libinstall -C src/lib libImlib2 ${D}${libdir}/
+        install -m 0644 ${S}/src/lib/Imlib2.h ${D}${incdir}/
+
         install -d ${D}${libdir}/imlib2/loaders
         for i in src/modules/loaders/.libs/*.so
         do
@@ -43,7 +45,7 @@ do_install_append() {
         done
 }
 
-PACKAGES =+ "imlib2-bin imlib2-loaders imlib2-filters"
+PACKAGES =+ "imlib2-loaders imlib2-filters"
 FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2"
 FILES_${PN}-dev += "${bindir}/imlib2-config"
 FILES_imlib2-bin = "${bindir}"
diff --git a/packages/embryo/.mtn2git_empty b/packages/embryo/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/embryo/.mtn2git_empty
+++ /dev/null
diff --git a/packages/embryo/embryo-native_0.9.1.013.bb b/packages/embryo/embryo-native_0.9.1.013.bb
deleted file mode 100644
index 89980d343e..0000000000
--- a/packages/embryo/embryo-native_0.9.1.013.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-include embryo_${PV}.bb
-inherit native
-
-do_stage () {
-	oe_libinstall -C src/lib libembryo ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Embryo.h ${STAGING_INCDIR}/
-}
diff --git a/packages/embryo/embryo_0.9.1.013.bb b/packages/embryo/embryo_0.9.1.013.bb
deleted file mode 100644
index 49a1e9df4e..0000000000
--- a/packages/embryo/embryo_0.9.1.013.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-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."
-SECTION = "e/libs"
-LICENSE = "MIT"
-PR = "r0"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/embryo-${PV}.tar.gz"
-S = "${WORKDIR}/embryo-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-do_stage () {
-	oe_libinstall -C src/lib libembryo ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Embryo.h ${STAGING_INCDIR}/
-}
-
-PACKAGES += "embryo-examples"
-
-FILES_${PN} = "${libdir}/libembryo*.so*"
-FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${datadir}"
-
diff --git a/packages/epeg/.mtn2git_empty b/packages/epeg/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/epeg/.mtn2git_empty
+++ /dev/null
diff --git a/packages/epeg/epeg_0.9.0.004.bb b/packages/epeg/epeg_0.9.0.004.bb
deleted file mode 100644
index aef2c178b9..0000000000
--- a/packages/epeg/epeg_0.9.0.004.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Epeg is a small library for handling thumbnails."
-SECTION = "e/libs"
-LICENSE = "MIT"
-DEPENDS = "jpeg"
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/epeg-${PV}.tar.gz"
-S = "${WORKDIR}/epeg-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-headers = "Epeg.h"
-
-do_stage() {
-    for i in ${headers}; do
-        install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
-    done
-    oe_libinstall -C src/lib libepeg ${STAGING_LIBDIR}/
-}
-
-PACKAGES = "epeg-dev epeg-doc epeg"
-FILES_${PN}-dev += "${bindir}/epeg-config ${bindir}/epeg"
diff --git a/packages/epeg/files/.mtn2git_empty b/packages/epeg/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/epeg/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/epsilon/.mtn2git_empty b/packages/epsilon/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/epsilon/.mtn2git_empty
+++ /dev/null
diff --git a/packages/epsilon/epsilon_0.3.0.004.bb b/packages/epsilon/epsilon_0.3.0.004.bb
deleted file mode 100644
index 12a7ec4e0a..0000000000
--- a/packages/epsilon/epsilon_0.3.0.004.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Epsilon is a flexable and powerful image thumbnailing library \
-that is complient with the freedesktop.org Thumbnail Managing Standard. \
-Unlike Epeg, Epsilon has native support for PNG, and is built upon Imlib2 \
-making any format supported by Imlib2 such as JPEG, PNG, XCF, TIFF and GIF. \
-To provide the best possible performance Epsilon can even integrate \
-with Epeg directly to harness it's speed."
-SECTION = "e/libs"
-LICENSE = "GPL"
-DEPENDS = "edje epeg libpng virtual/imlib2"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/epsilon-${PV}.tar.gz \
-           file://compile-fix.patch;patch=1"
-S = "${WORKDIR}/epsilon-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-do_stage () {
-	oe_libinstall -C src/lib libepsilon ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Epsilon.h ${STAGING_INCDIR}/
-}
-
-PACKAGES = "epsilon-examples epsilon-dev epsilon"
-FILES_${PN}-dev += "${bindir}/epsilon-config"
-FILES_epsilon-examples = "${bindir}/epsilon"
-
diff --git a/packages/epsilon/files/.mtn2git_empty b/packages/epsilon/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/epsilon/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/esmart/esmart_0.9.0.004.bb b/packages/esmart/esmart_0.9.0.004.bb
deleted file mode 100644
index e0f7272872..0000000000
--- a/packages/esmart/esmart_0.9.0.004.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "ESmart is a collection of smart Evas objects"
-SECTION = "e/libs"
-LICENSE = "MIT"
-DEPENDS = "eet evas-x11 ecore-x11 epsilon embryo virtual/imlib2 jpeg libtool"
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/esmart-${PV}.tar.gz \
-           file://compile-fix.patch;patch=1"
-S = "${WORKDIR}/esmart-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-headers = "esmart_container/Esmart_Container.h \
-           esmart_draggies/Esmart_Draggies.h \
-           esmart_file_dialog/Esmart_File_Dialog.h \
-           esmart_textarea/Esmart_Textarea.h \
-           esmart_thumb/Esmart_Thumb.h \
-           esmart_trans_x11/Esmart_Trans_X11.h"
-
-do_stage() {
-    for i in ${headers}; do
-        install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
-    done
-    oe_libinstall -C src/lib libsmart ${STAGING_LIBDIR}/
-}
-
-PACKAGES = "esmart-dev esmart-doc esmart"
-FILES_${PN}-dev += "${bindir}/esmart-config ${bindir}/esmart"
diff --git a/packages/etox/.mtn2git_empty b/packages/etox/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/etox/.mtn2git_empty
+++ /dev/null
diff --git a/packages/etox/etox_0.9.0.004.bb b/packages/etox/etox_0.9.0.004.bb
deleted file mode 100644
index 26c24cc6b7..0000000000
--- a/packages/etox/etox_0.9.0.004.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Etox is a type setting and text layout library based on Evas. \
-Etox helps you when it comes to displaying, moving, resizing, layering, \
-clipping, aligning and coloring fonts in different styles, and more."
-SECTION = "e/libs"
-DEPENDS = "edb virtual/evas virtual/ecore"
-LICENSE = "MIT"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r0"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/etox-${PV}.tar.gz"
-S = "${WORKDIR}/etox-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-do_stage () {
-	oe_libinstall -C src libetox ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/Etox.h ${STAGING_INCDIR}/
-}
-
-PACKAGES += "etox-examples"
-
-FILES_${PN} = "${libdir}/libetox*.so*"
-FILES_${PN}-dev += "${bindir}/etox-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/etox* ${datadir}"
diff --git a/packages/evas/.mtn2git_empty b/packages/evas/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/evas/.mtn2git_empty
+++ /dev/null
diff --git a/packages/evas/evas-native_0.9.9.013.bb b/packages/evas/evas-native_0.9.9.013.bb
deleted file mode 100644
index ea23901c50..0000000000
--- a/packages/evas/evas-native_0.9.9.013.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-include evas-fb_${PV}.bb
-inherit native
-DEPENDS = "freetype-native"
-
-export EDB_CONFIG = "${STAGING_BINDIR}/edb-config-native"
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config-native"
-
-do_stage () {
-        for i in ${headers}
-        do
-                install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
-        done
-        oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
-}
-
-do_install() {
-	:
-}
-
diff --git a/packages/evas/files/.mtn2git_empty b/packages/evas/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/evas/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ewl/.mtn2git_empty b/packages/ewl/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/ewl/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ewl/ewl/.mtn2git_empty b/packages/ewl/ewl/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/ewl/ewl/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ewl/ewl/no-x-test.patch b/packages/ewl/ewl/no-x-test.patch
deleted file mode 100644
index c75da4ac04..0000000000
--- a/packages/ewl/ewl/no-x-test.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- ewl/test/ewl_embed_test.c~no-x-test
-+++ ewl/test/ewl_embed_test.c
-@@ -41,11 +41,12 @@
- 
- 	ewl_init(&argc, argv);
- 	ecore_evas_init();
--
-+#if 0
- 	if (!(ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 320, 240))) {
- 		printf("Failed to open display, exiting\n");
- 		exit(1);
- 	}
-+#endif
- 	ecore_evas_title_set(ee, "EWL Embed Test App");
- 	ecore_evas_name_class_set(ee, "EWL TEST APP", "EWL TEST APP");
- 	ecore_evas_show(ee);
-@@ -58,8 +59,10 @@
- 	evas_object_show(bg);
- 
- 	embed = ewl_embed_new();
-+#if 0
- 	embobj = ewl_embed_evas_set(EWL_EMBED(embed), ecore_evas_get(ee),
- 				    EWL_EMBED_EVAS_WINDOW(ecore_evas_software_x11_window_get(ee)));
-+#endif
- 	ewl_embed_focus_set(EWL_EMBED(embed), TRUE);
- 	evas_object_layer_set(embobj, 1);
- 	evas_object_show(embobj);
diff --git a/packages/ewl/ewl_0.0.4.004.bb b/packages/ewl/ewl_0.0.4.004.bb
deleted file mode 100644
index f309169dfa..0000000000
--- a/packages/ewl/ewl_0.0.4.004.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "The Enlightened Widget Library, \
-a simple-to-use general purpose widget library based on the enlightenment foundation libraries."
-SECTION = "e/libs"
-DEPENDS = "edb eet virtual/evas virtual/ecore etox edje"
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "MIT"
-PR = "r0"
-
-SRC_URI = "http://enlightenment.freedesktop.org/files/ewl-${PV}.tar.gz \
-           file://fix-configure.patch;patch=1"
-S = "${WORKDIR}/ewl-${PV}"
-
-inherit autotools binconfig
-
-PARALLEL_MAKE = ""
-
-do_stage () {
-	oe_libinstall -C src libewl ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Ewl.h ${STAGING_INCDIR}/
-}
-
-PACKAGES += "ewl-examples"
-
-FILES_${PN} = "${libdir}/libewl*.so*"
-FILES_${PN}-dev += "${bindir}/ewl-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/ewl* ${bindir}/edje_ls ${datadir}"
-
diff --git a/packages/freetype/freetype-native_2.1.7.bb b/packages/freetype/freetype-native_2.1.7.bb
deleted file mode 100644
index 673cdb0d02..0000000000
--- a/packages/freetype/freetype-native_2.1.7.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SECTION = "base"
-LICENSE = "freetype"
-DESCRIPTION = "Freetype font rendering library"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1"
-
-inherit autotools pkgconfig native binconfig
-DEPENDS = ""
-FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
-S = "${WORKDIR}/freetype-${PV}"
-PACKAGES = ""
-
-do_configure () {
-	(cd builds/unix && gnu-configize) || die "failure running gnu-configize"
-	oe_runconf
-}
-
-do_stage () {
-	autotools_stage_includes
-	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-}
diff --git a/packages/freetype/freetype-native_2.1.8.bb b/packages/freetype/freetype-native_2.1.8.bb
index ba8b59fe4d..64fac71cbe 100644
--- a/packages/freetype/freetype-native_2.1.8.bb
+++ b/packages/freetype/freetype-native_2.1.8.bb
@@ -1,24 +1,21 @@
-SECTION = "libs"
-LICENSE = "freetype"
-DESCRIPTION = "Freetype font rendering library"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-	   file://${FILESDIR}/configure.patch;patch=1"
-
-inherit autotools pkgconfig native binconfig
+include freetype_${PV}.bb
+inherit native
 DEPENDS = ""
 FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
-S = "${WORKDIR}/freetype-${PV}"
-PACKAGES = ""
 
-do_configure () {
+EXTRA_OEMAKE=
+
+do_configure() {
 	(cd builds/unix && gnu-configize) || die "failure running gnu-configize"
 	oe_runconf
 }
 
-do_stage () {
+do_stage() {
 	autotools_stage_includes
 	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
 }
+
+do_install() {
+	:
+}
+
diff --git a/packages/freetype/freetype_2.1.7.bb b/packages/freetype/freetype_2.1.7.bb
deleted file mode 100644
index 751a4ae51c..0000000000
--- a/packages/freetype/freetype_2.1.7.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SECTION = "libs"
-LICENSE = "freetype"
-DESCRIPTION = "Freetype font rendering library"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetpye-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += " ${bindir}"
-
-inherit autotools binconfig pkgconfig
-
-LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
-EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
-
-do_configure () {
-	cd builds/unix
-	gnu-configize
-	aclocal -I .
-	autoconf
-	cd ${S}
-	oe_runconf
-}
-
-do_stage () {
-	autotools_stage_includes
-	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-}
diff --git a/packages/freetype/freetype_2.1.8.bb b/packages/freetype/freetype_2.1.8.bb
index 49f71551dd..5e9db480ea 100644
--- a/packages/freetype/freetype_2.1.8.bb
+++ b/packages/freetype/freetype_2.1.8.bb
@@ -1,21 +1,18 @@
+DESCRIPTION = "Freetype font rendering library"
 SECTION = "libs"
 LICENSE = "freetype"
-DESCRIPTION = "Freetype font rendering library"
-
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += " ${bindir}"
+S = "${WORKDIR}/freetype-${PV}"
 
 inherit autotools pkgconfig binconfig
 
 LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
 EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
 
-do_configure () {
+do_configure() {
 	cd builds/unix
 	gnu-configize
 	aclocal -I .
@@ -24,7 +21,10 @@ do_configure () {
 	oe_runconf
 }
 
-do_stage () {
+do_stage() {
 	autotools_stage_includes
 	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
 }
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
diff --git a/packages/imlib2/.mtn2git_empty b/packages/imlib2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/imlib2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/imlib2/files/.mtn2git_empty b/packages/imlib2/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/imlib2/files/.mtn2git_empty
+++ /dev/null