merge of 8682c577fb2d85f5eba728c853258b0de8554651

     and e35e2ff24f4fd9e88928070713917ac9ebae8029

8 files changed, 39 insertions, 28 deletions

diff --git a/packages/curl/curl-native_7.14.0.bb b/packages/curl/curl-native_7.14.0.bb
index 7b99c7c3b4..0fc2e14452 100644
--- a/packages/curl/curl-native_7.14.0.bb
+++ b/packages/curl/curl-native_7.14.0.bb
@@ -1,3 +1,7 @@
 include curl_${PV}.bb
 inherit native
 
+do_install() {
+	:
+}
+
diff --git a/packages/ecore/ecore-native_0.9.9.013.bb b/packages/ecore/ecore-native_0.9.9.013.bb
index cd60c15ed4..4ead109e00 100644
--- a/packages/ecore/ecore-native_0.9.9.013.bb
+++ b/packages/ecore/ecore-native_0.9.9.013.bb
@@ -16,3 +16,7 @@ do_stage () {
 	install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/
 	install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
 }
+
+do_install() {
+	:
+}
diff --git a/packages/edb/edb-native_1.0.5.004.bb b/packages/edb/edb-native_1.0.5.004.bb
index b570683020..59cb8da587 100644
--- a/packages/edb/edb-native_1.0.5.004.bb
+++ b/packages/edb/edb-native_1.0.5.004.bb
@@ -1,16 +1,14 @@
-DESCRIPTION = "EDB is a database convenience library wrapped around the \
-Berkeley DB 2.7.7 by Sleepycat Software."
-LICENSE = "BSD"
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
-SECTION = "e/libs"
-PRIORITY = "optional"
 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}/
+	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/edje/edje-native_0.5.0.013.bb b/packages/edje/edje-native_0.5.0.013.bb
index b3c24a6af1..dd0ca2b593 100644
--- a/packages/edje/edje-native_0.5.0.013.bb
+++ b/packages/edje/edje-native_0.5.0.013.bb
@@ -16,3 +16,8 @@ do_stage() {
 		install -m 0755 src/bin/$i ${STAGING_BINDIR}
 	done
 }
+
+do_install() {
+	:
+}
+
diff --git a/packages/eet/eet-native_0.9.10.013.bb b/packages/eet/eet-native_0.9.10.013.bb
index b08b724312..81f0a349fa 100644
--- a/packages/eet/eet-native_0.9.10.013.bb
+++ b/packages/eet/eet-native_0.9.10.013.bb
@@ -1,10 +1,3 @@
-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"
-MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
-SECTION = "e/libs"
 PRIORITY = "optional"
 include eet_${PV}.bb
 inherit native
@@ -12,7 +5,11 @@ 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}/
+	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
index 2d62a6e9da..c2a7296706 100644
--- a/packages/eet/eet_0.9.10.013.bb
+++ b/packages/eet/eet_0.9.10.013.bb
@@ -9,19 +9,14 @@ DEPENDS = "zlib jpeg"
 PR = "r0"
 LICENSE = "BSD"
 
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-
 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}/
+	oe_libinstall -C src/lib libeet ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/src/lib/Eet.h ${STAGING_INCDIR}/
 }
 
 FILES_${PN} = "${libdir}/libeet*.so*"
diff --git a/packages/evas/evas-native_0.9.9.013.bb b/packages/evas/evas-native_0.9.9.013.bb
index ce45eedcc5..ea23901c50 100644
--- a/packages/evas/evas-native_0.9.9.013.bb
+++ b/packages/evas/evas-native_0.9.9.013.bb
@@ -13,4 +13,7 @@ do_stage () {
         oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
 }
 
-#FIXME: Conflicts with zlib-devel on the build machine. Remove it and it builds.
+do_install() {
+	:
+}
+
diff --git a/packages/imlib2/imlib2-native_1.2.1.004.bb b/packages/imlib2/imlib2-native_1.2.1.004.bb
index e3a46c4aba..b4310c29a5 100644
--- a/packages/imlib2/imlib2-native_1.2.1.004.bb
+++ b/packages/imlib2/imlib2-native_1.2.1.004.bb
@@ -4,3 +4,8 @@ DEPENDS = "freetype-native libpng-native jpeg-native"
 
 EXTRA_OECONF = "--disable-mmx \
                 --without-x"
+
+do_install() {
+	:
+}
+