From 6ff431dbc83c6f843d6e5b75ec24db66b4f0e32c Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 18 Jul 2007 13:47:06 +0000
Subject: efl: next round of updates / cleanups

---
 packages/efl1/edje-native_0.5.0.038.bb   | 16 ---------
 packages/efl1/edje-native_0.5.0.040.bb   | 16 +++++++++
 packages/efl1/edje_0.5.0.038.bb          | 20 -----------
 packages/efl1/edje_0.5.0.040.bb          | 20 +++++++++++
 packages/efl1/eet-native_0.9.10.038.bb   |  4 ---
 packages/efl1/eet-native_0.9.10.040.bb   |  4 +++
 packages/efl1/eet_0.9.10.038.bb          | 11 ------
 packages/efl1/eet_0.9.10.040.bb          |  9 +++++
 packages/efl1/efreet_0.0.3.002.bb        | 10 ------
 packages/efl1/efreet_0.0.3.005.bb        | 10 ++++++
 packages/efl1/embryo-native_0.9.1.038.bb |  3 --
 packages/efl1/embryo-native_0.9.1.040.bb |  3 ++
 packages/efl1/embryo_0.9.1.038.bb        | 11 ------
 packages/efl1/embryo_0.9.1.040.bb        | 11 ++++++
 packages/efl1/emotion_0.0.1.006.bb       | 16 ---------
 packages/efl1/emotion_0.0.1.007.bb       | 14 ++++++++
 packages/efl1/epeg_0.9.0.009.bb          |  8 -----
 packages/efl1/epeg_0.9.0.010.bb          |  8 +++++
 packages/efl1/epsilon_0.3.0.009.bb       | 12 -------
 packages/efl1/epsilon_0.3.0.010.bb       | 12 +++++++
 packages/efl1/esmart_0.9.0.009.bb        | 24 -------------
 packages/efl1/esmart_0.9.0.010.bb        | 24 +++++++++++++
 packages/efl1/evas-native_0.9.9.038.bb   | 60 --------------------------------
 packages/efl1/evas-native_0.9.9.040.bb   | 60 ++++++++++++++++++++++++++++++++
 packages/efl1/evas.inc                   | 22 +-----------
 packages/efl1/evas_0.9.9.038.bb          | 58 ------------------------------
 packages/efl1/evas_0.9.9.040.bb          | 58 ++++++++++++++++++++++++++++++
 packages/efl1/ewl_0.5.1.009.bb           | 11 ------
 packages/efl1/ewl_0.5.1.010.bb           |  9 +++++
 packages/efl1/imlib2_1.4.0.001.bb        | 18 ----------
 packages/efl1/imlib2_1.4.0.002.bb        | 17 +++++++++
 31 files changed, 276 insertions(+), 303 deletions(-)
 delete mode 100644 packages/efl1/edje-native_0.5.0.038.bb
 create mode 100644 packages/efl1/edje-native_0.5.0.040.bb
 delete mode 100644 packages/efl1/edje_0.5.0.038.bb
 create mode 100644 packages/efl1/edje_0.5.0.040.bb
 delete mode 100644 packages/efl1/eet-native_0.9.10.038.bb
 create mode 100644 packages/efl1/eet-native_0.9.10.040.bb
 delete mode 100644 packages/efl1/eet_0.9.10.038.bb
 create mode 100644 packages/efl1/eet_0.9.10.040.bb
 delete mode 100644 packages/efl1/efreet_0.0.3.002.bb
 create mode 100644 packages/efl1/efreet_0.0.3.005.bb
 delete mode 100644 packages/efl1/embryo-native_0.9.1.038.bb
 create mode 100644 packages/efl1/embryo-native_0.9.1.040.bb
 delete mode 100644 packages/efl1/embryo_0.9.1.038.bb
 create mode 100644 packages/efl1/embryo_0.9.1.040.bb
 delete mode 100644 packages/efl1/emotion_0.0.1.006.bb
 create mode 100644 packages/efl1/emotion_0.0.1.007.bb
 delete mode 100644 packages/efl1/epeg_0.9.0.009.bb
 create mode 100644 packages/efl1/epeg_0.9.0.010.bb
 delete mode 100644 packages/efl1/epsilon_0.3.0.009.bb
 create mode 100644 packages/efl1/epsilon_0.3.0.010.bb
 delete mode 100644 packages/efl1/esmart_0.9.0.009.bb
 create mode 100644 packages/efl1/esmart_0.9.0.010.bb
 delete mode 100644 packages/efl1/evas-native_0.9.9.038.bb
 create mode 100644 packages/efl1/evas-native_0.9.9.040.bb
 delete mode 100644 packages/efl1/evas_0.9.9.038.bb
 create mode 100644 packages/efl1/evas_0.9.9.040.bb
 delete mode 100644 packages/efl1/ewl_0.5.1.009.bb
 create mode 100644 packages/efl1/ewl_0.5.1.010.bb
 delete mode 100644 packages/efl1/imlib2_1.4.0.001.bb
 create mode 100644 packages/efl1/imlib2_1.4.0.002.bb

diff --git a/packages/efl1/edje-native_0.5.0.038.bb b/packages/efl1/edje-native_0.5.0.038.bb
deleted file mode 100644
index 8f3ef51fa7..0000000000
--- a/packages/efl1/edje-native_0.5.0.038.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require edje_${PV}.bb
-inherit native
-PR = "r4"
-
-DEPENDS = "evas-native ecore-native eet-native embryo-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
-
-do_configure_prepend() {
-	sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
-	sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c
-	sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c
-}
-
-do_stage_append() {
-	efl_stage_bin
-}
diff --git a/packages/efl1/edje-native_0.5.0.040.bb b/packages/efl1/edje-native_0.5.0.040.bb
new file mode 100644
index 0000000000..8f3ef51fa7
--- /dev/null
+++ b/packages/efl1/edje-native_0.5.0.040.bb
@@ -0,0 +1,16 @@
+require edje_${PV}.bb
+inherit native
+PR = "r4"
+
+DEPENDS = "evas-native ecore-native eet-native embryo-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
+
+do_configure_prepend() {
+	sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
+	sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c
+	sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c
+}
+
+do_stage_append() {
+	efl_stage_bin
+}
diff --git a/packages/efl1/edje_0.5.0.038.bb b/packages/efl1/edje_0.5.0.038.bb
deleted file mode 100644
index 7db9951e8d..0000000000
--- a/packages/efl1/edje_0.5.0.038.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Edje is a complex graphical design & layout library."
-# can also install vim data files
-DEPENDS = "eet evas ecore embryo edje-native"
-LICENSE = "MIT"
-PR = "r7"
-
-inherit efl1 lib_package
-
-SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101"
-
-do_configure_prepend() {
-	install -d "${S}/m4"
-	install "${WORKDIR}/m4/"*.m4 "${S}/m4"
-	aclocal -I m4
-}
-
-FILES_${PN}-dev =+ "${bindir} ${datadir}"
-FILES_${PN}-examples = ""
-FILES_${PN}-bin = ""
-
diff --git a/packages/efl1/edje_0.5.0.040.bb b/packages/efl1/edje_0.5.0.040.bb
new file mode 100644
index 0000000000..7db9951e8d
--- /dev/null
+++ b/packages/efl1/edje_0.5.0.040.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Edje is a complex graphical design & layout library."
+# can also install vim data files
+DEPENDS = "eet evas ecore embryo edje-native"
+LICENSE = "MIT"
+PR = "r7"
+
+inherit efl1 lib_package
+
+SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101"
+
+do_configure_prepend() {
+	install -d "${S}/m4"
+	install "${WORKDIR}/m4/"*.m4 "${S}/m4"
+	aclocal -I m4
+}
+
+FILES_${PN}-dev =+ "${bindir} ${datadir}"
+FILES_${PN}-examples = ""
+FILES_${PN}-bin = ""
+
diff --git a/packages/efl1/eet-native_0.9.10.038.bb b/packages/efl1/eet-native_0.9.10.038.bb
deleted file mode 100644
index 9e2426ca9f..0000000000
--- a/packages/efl1/eet-native_0.9.10.038.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require eet_${PV}.bb
-inherit native
-DEPENDS = "zlib-native jpeg-native"
-
diff --git a/packages/efl1/eet-native_0.9.10.040.bb b/packages/efl1/eet-native_0.9.10.040.bb
new file mode 100644
index 0000000000..9e2426ca9f
--- /dev/null
+++ b/packages/efl1/eet-native_0.9.10.040.bb
@@ -0,0 +1,4 @@
+require eet_${PV}.bb
+inherit native
+DEPENDS = "zlib-native jpeg-native"
+
diff --git a/packages/efl1/eet_0.9.10.038.bb b/packages/efl1/eet_0.9.10.038.bb
deleted file mode 100644
index 08935df750..0000000000
--- a/packages/efl1/eet_0.9.10.038.bb
+++ /dev/null
@@ -1,11 +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."
-DEPENDS = "zlib jpeg"
-LICENSE = "BSD"
-PR = "r0"
-
-inherit efl1
-
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-05-06/eet-${PV}.tar.gz"
diff --git a/packages/efl1/eet_0.9.10.040.bb b/packages/efl1/eet_0.9.10.040.bb
new file mode 100644
index 0000000000..cbe1f304fe
--- /dev/null
+++ b/packages/efl1/eet_0.9.10.040.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 efl1
diff --git a/packages/efl1/efreet_0.0.3.002.bb b/packages/efl1/efreet_0.0.3.002.bb
deleted file mode 100644
index b387ee89a0..0000000000
--- a/packages/efl1/efreet_0.0.3.002.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "An implementation of freedesktop.org specs for the \
-Enlightenment Foundation Libraries"
-DEPENDS = "ecore"
-LICENSE = "BSD"
-PR = "r0"
-
-inherit efl1
-
-PACKAGES =+ "efreet-tests"
-FILES_efreet-tests = "${bindir}/*_* ${datadir}"
diff --git a/packages/efl1/efreet_0.0.3.005.bb b/packages/efl1/efreet_0.0.3.005.bb
new file mode 100644
index 0000000000..b387ee89a0
--- /dev/null
+++ b/packages/efl1/efreet_0.0.3.005.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "An implementation of freedesktop.org specs for the \
+Enlightenment Foundation Libraries"
+DEPENDS = "ecore"
+LICENSE = "BSD"
+PR = "r0"
+
+inherit efl1
+
+PACKAGES =+ "efreet-tests"
+FILES_efreet-tests = "${bindir}/*_* ${datadir}"
diff --git a/packages/efl1/embryo-native_0.9.1.038.bb b/packages/efl1/embryo-native_0.9.1.038.bb
deleted file mode 100644
index 2fc3faddfd..0000000000
--- a/packages/efl1/embryo-native_0.9.1.038.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require embryo_${PV}.bb
-inherit native
-
diff --git a/packages/efl1/embryo-native_0.9.1.040.bb b/packages/efl1/embryo-native_0.9.1.040.bb
new file mode 100644
index 0000000000..2fc3faddfd
--- /dev/null
+++ b/packages/efl1/embryo-native_0.9.1.040.bb
@@ -0,0 +1,3 @@
+require embryo_${PV}.bb
+inherit native
+
diff --git a/packages/efl1/embryo_0.9.1.038.bb b/packages/efl1/embryo_0.9.1.038.bb
deleted file mode 100644
index 0728ef563b..0000000000
--- a/packages/efl1/embryo_0.9.1.038.bb
+++ /dev/null
@@ -1,11 +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."
-LICENSE = "MIT"
-PR = "r0"
-
-inherit efl1 lib_package
-
-FILES_${PN}-examples = "${datadir}/${PN}/examples"
diff --git a/packages/efl1/embryo_0.9.1.040.bb b/packages/efl1/embryo_0.9.1.040.bb
new file mode 100644
index 0000000000..0728ef563b
--- /dev/null
+++ b/packages/efl1/embryo_0.9.1.040.bb
@@ -0,0 +1,11 @@
+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 efl1 lib_package
+
+FILES_${PN}-examples = "${datadir}/${PN}/examples"
diff --git a/packages/efl1/emotion_0.0.1.006.bb b/packages/efl1/emotion_0.0.1.006.bb
deleted file mode 100644
index bdfcbebee1..0000000000
--- a/packages/efl1/emotion_0.0.1.006.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Emotion is a multimedia library with backends: gstreamer and libxine"
-LICENSE = "MIT"
-# we no longer build the libxine backend, since the gstreamer backend seems more promising
-DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
-RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
-PR = "r0"
-
-inherit efl1
-
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/emotion-${PV}.tar.gz"
-
-EXTRA_OECONF = "--disable-xine --enable-gstreamer"
-
-PACKAGES =+ "emotion-backend-gstreamer emotion-test"
-FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
-FILES_emotion-test = "${bindir}/emotion_test ${datadir}"
diff --git a/packages/efl1/emotion_0.0.1.007.bb b/packages/efl1/emotion_0.0.1.007.bb
new file mode 100644
index 0000000000..2a65d17220
--- /dev/null
+++ b/packages/efl1/emotion_0.0.1.007.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Emotion is a multimedia library with backends: gstreamer and libxine"
+LICENSE = "MIT"
+# we no longer build the libxine backend, since the gstreamer backend seems more promising
+DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
+RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
+PR = "r0"
+
+inherit efl1
+
+EXTRA_OECONF = "--disable-xine --enable-gstreamer"
+
+PACKAGES =+ "emotion-backend-gstreamer emotion-test"
+FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
+FILES_emotion-test = "${bindir}/emotion_test ${datadir}"
diff --git a/packages/efl1/epeg_0.9.0.009.bb b/packages/efl1/epeg_0.9.0.009.bb
deleted file mode 100644
index 6a99269291..0000000000
--- a/packages/efl1/epeg_0.9.0.009.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "Epeg is a small library for handling thumbnails."
-LICENSE = "MIT"
-DEPENDS = "jpeg"
-
-inherit efl1
-
-FILES_${PN} = "${libdir}/lib*.so*"
-FILES_${PN}-dev += "${bindir}/*-config"
diff --git a/packages/efl1/epeg_0.9.0.010.bb b/packages/efl1/epeg_0.9.0.010.bb
new file mode 100644
index 0000000000..6a99269291
--- /dev/null
+++ b/packages/efl1/epeg_0.9.0.010.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Epeg is a small library for handling thumbnails."
+LICENSE = "MIT"
+DEPENDS = "jpeg"
+
+inherit efl1
+
+FILES_${PN} = "${libdir}/lib*.so*"
+FILES_${PN}-dev += "${bindir}/*-config"
diff --git a/packages/efl1/epsilon_0.3.0.009.bb b/packages/efl1/epsilon_0.3.0.009.bb
deleted file mode 100644
index ffda151f8b..0000000000
--- a/packages/efl1/epsilon_0.3.0.009.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Epsilon is a flexible and powerful image thumbnailing library \
-that is compliant with the freedesktop.org Thumbnail Managing Standard."
-LICENSE = "BSD"
-# can also depend on xine for movie thumbnails
-DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
-PR = "r1"
-
-inherit efl1
-
-PACKAGES =+ "epsilon-tests"
-FILES_epsilon-tests = "${bindir}/${PN} ${bindir}/*_* ${datadir}"
-FILES_${PN} = "${libdir}/lib*.so*"
diff --git a/packages/efl1/epsilon_0.3.0.010.bb b/packages/efl1/epsilon_0.3.0.010.bb
new file mode 100644
index 0000000000..ffda151f8b
--- /dev/null
+++ b/packages/efl1/epsilon_0.3.0.010.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Epsilon is a flexible and powerful image thumbnailing library \
+that is compliant with the freedesktop.org Thumbnail Managing Standard."
+LICENSE = "BSD"
+# can also depend on xine for movie thumbnails
+DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
+PR = "r1"
+
+inherit efl1
+
+PACKAGES =+ "epsilon-tests"
+FILES_epsilon-tests = "${bindir}/${PN} ${bindir}/*_* ${datadir}"
+FILES_${PN} = "${libdir}/lib*.so*"
diff --git a/packages/efl1/esmart_0.9.0.009.bb b/packages/efl1/esmart_0.9.0.009.bb
deleted file mode 100644
index 928a8c1afd..0000000000
--- a/packages/efl1/esmart_0.9.0.009.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "ESmart is a collection of smart Evas objects"
-LICENSE = "MIT"
-DEPENDS = "evas ecore edje imlib2 epsilon libtool"
-
-inherit efl1
-
-S = "${WORKDIR}/esmart-${PV}"
-
-PACKAGES =+ "${PN}-textentry \
-             ${PN}-thumb \
-             ${PN}-container \
-             ${PN}-container-plugins \
-             ${PN}-file-dialog \
-             ${PN}-draggies \
-             ${PN}-trans-x11"
-FILES_${PN}-dbg += "${libdir}/.debug/ ${libdir}/esmart/*/.debug/"
-FILES_${PN}-textentry = "${libdir}/libesmart_text_entry*.so*"
-FILES_${PN}-thumb = "${libdir}/libesmart_thumb*.so*"
-FILES_${PN}-container = "${libdir}/libesmart_container*"
-DEPENDS_${PN}-container += "${PN}-container-plugins"
-FILES_${PN}-container-plugins = "${libdir}/esmart/layout/*.so"
-FILES_${PN}-file-dialog = "${libdir}/libesmart_file_dialog*.so*"
-FILES_${PN}-draggies = "${libdir}/libesmart_draggies*.so*"
-FILES_${PN}-trans-x11 = "${libdir}/libesmart_trans_x11*.so*"
diff --git a/packages/efl1/esmart_0.9.0.010.bb b/packages/efl1/esmart_0.9.0.010.bb
new file mode 100644
index 0000000000..928a8c1afd
--- /dev/null
+++ b/packages/efl1/esmart_0.9.0.010.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "ESmart is a collection of smart Evas objects"
+LICENSE = "MIT"
+DEPENDS = "evas ecore edje imlib2 epsilon libtool"
+
+inherit efl1
+
+S = "${WORKDIR}/esmart-${PV}"
+
+PACKAGES =+ "${PN}-textentry \
+             ${PN}-thumb \
+             ${PN}-container \
+             ${PN}-container-plugins \
+             ${PN}-file-dialog \
+             ${PN}-draggies \
+             ${PN}-trans-x11"
+FILES_${PN}-dbg += "${libdir}/.debug/ ${libdir}/esmart/*/.debug/"
+FILES_${PN}-textentry = "${libdir}/libesmart_text_entry*.so*"
+FILES_${PN}-thumb = "${libdir}/libesmart_thumb*.so*"
+FILES_${PN}-container = "${libdir}/libesmart_container*"
+DEPENDS_${PN}-container += "${PN}-container-plugins"
+FILES_${PN}-container-plugins = "${libdir}/esmart/layout/*.so"
+FILES_${PN}-file-dialog = "${libdir}/libesmart_file_dialog*.so*"
+FILES_${PN}-draggies = "${libdir}/libesmart_draggies*.so*"
+FILES_${PN}-trans-x11 = "${libdir}/libesmart_trans_x11*.so*"
diff --git a/packages/efl1/evas-native_0.9.9.038.bb b/packages/efl1/evas-native_0.9.9.038.bb
deleted file mode 100644
index e79695c1f2..0000000000
--- a/packages/efl1/evas-native_0.9.9.038.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-require evas.inc
-inherit native
-DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
-PR = "r9"
-
-EXTRA_OECONF = "\
-		--x-includes=${STAGING_INCDIR}/X11  \
-		--x-libraries=${STAGING_LIBDIR} \
-		--disable-fb					\
-		--disable-directfb			\
-		--enable-buffer				\
-		--disable-software-ddraw	\
-		--disable-software-qtopia	\
-		--disable-software-x11		\
-		--disable-software-16-x11	\
-		--disable-software-xcb		\
-		--disable-gl-x11			\
-		--disable-xrender-x11		\
-		--disable-xrender-xcb		\
-		--disable-glitz-x11			\
-		--enable-image-loader-eet	\
-		--disable-image-loader-edb	\
-		--disable-image-loader-gif	\
-		--enable-image-loader-png	\
-		--enable-image-loader-jpeg	\
-		--enable-image-loader-tiff	\
-		--enable-image-loader-xpm	\
-		--disable-image-loader-svg	\
-		--enable-cpu-c				\
-		--enable-fontconfig			\
-		--enable-font-loader-eet	\
-		--enable-scale-sample		\
-		--enable-scale-smooth		\
-		--enable-convert-yuv		\
-		--enable-small-dither-mask	\
-		--disable-no-dither-mask	\
-		--disable-convert-8-rgb-332	\
-		--disable-convert-8-rgb-666	\
-		--disable-convert-8-rgb-232	\
-		--disable-convert-8-rgb-222	\
-		--disable-convert-8-rgb-221	\
-		--disable-convert-8-rgb-121	\
-		--disable-convert-8-rgb-111	\
-		--enable-convert-16-rgb-565	\
-		--disable-convert-16-rgb-555	\
-		--disable-convert-16-rgb-444	\
-		--disable-convert-16-rgb-ipq	\
-		--enable-convert-16-rgb-rot-0	\
-		--disable-convert-16-rgb-rot-90	\
-		--enable-convert-16-rgb-rot-270	\
-		--disable-convert-24-rgb-888	\
-		--disable-convert-24-bgr-888	\
-		--disable-convert-32-rgb-8888	\
-		--disable-convert-32-rgbx-8888	\
-		--disable-convert-32-bgr-8888	\
-		--disable-convert-32-bgrx-8888	\
-		--disable-convert-32-rgb-rot-0	\
-		--disable-convert-32-rgb-rot-90	\
-		--disable-convert-32-rgb-rot-270"
-
diff --git a/packages/efl1/evas-native_0.9.9.040.bb b/packages/efl1/evas-native_0.9.9.040.bb
new file mode 100644
index 0000000000..e79695c1f2
--- /dev/null
+++ b/packages/efl1/evas-native_0.9.9.040.bb
@@ -0,0 +1,60 @@
+require evas.inc
+inherit native
+DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
+PR = "r9"
+
+EXTRA_OECONF = "\
+		--x-includes=${STAGING_INCDIR}/X11  \
+		--x-libraries=${STAGING_LIBDIR} \
+		--disable-fb					\
+		--disable-directfb			\
+		--enable-buffer				\
+		--disable-software-ddraw	\
+		--disable-software-qtopia	\
+		--disable-software-x11		\
+		--disable-software-16-x11	\
+		--disable-software-xcb		\
+		--disable-gl-x11			\
+		--disable-xrender-x11		\
+		--disable-xrender-xcb		\
+		--disable-glitz-x11			\
+		--enable-image-loader-eet	\
+		--disable-image-loader-edb	\
+		--disable-image-loader-gif	\
+		--enable-image-loader-png	\
+		--enable-image-loader-jpeg	\
+		--enable-image-loader-tiff	\
+		--enable-image-loader-xpm	\
+		--disable-image-loader-svg	\
+		--enable-cpu-c				\
+		--enable-fontconfig			\
+		--enable-font-loader-eet	\
+		--enable-scale-sample		\
+		--enable-scale-smooth		\
+		--enable-convert-yuv		\
+		--enable-small-dither-mask	\
+		--disable-no-dither-mask	\
+		--disable-convert-8-rgb-332	\
+		--disable-convert-8-rgb-666	\
+		--disable-convert-8-rgb-232	\
+		--disable-convert-8-rgb-222	\
+		--disable-convert-8-rgb-221	\
+		--disable-convert-8-rgb-121	\
+		--disable-convert-8-rgb-111	\
+		--enable-convert-16-rgb-565	\
+		--disable-convert-16-rgb-555	\
+		--disable-convert-16-rgb-444	\
+		--disable-convert-16-rgb-ipq	\
+		--enable-convert-16-rgb-rot-0	\
+		--disable-convert-16-rgb-rot-90	\
+		--enable-convert-16-rgb-rot-270	\
+		--disable-convert-24-rgb-888	\
+		--disable-convert-24-bgr-888	\
+		--disable-convert-32-rgb-8888	\
+		--disable-convert-32-rgbx-8888	\
+		--disable-convert-32-bgr-8888	\
+		--disable-convert-32-bgrx-8888	\
+		--disable-convert-32-rgb-rot-0	\
+		--disable-convert-32-rgb-rot-90	\
+		--disable-convert-32-rgb-rot-270"
+
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index f3d78f0255..c631b26eb1 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -10,23 +10,13 @@ inherit efl1
 
 export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
 
-SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
-           file://fix-configure.patch;patch=1 \
-           ${E_CVS};module=e17/libs/evas/m4;date=20060101"
+SRC_URI += "file://fix-configure.patch;patch=1"
 
 S = "${WORKDIR}/evas-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 
 EXTRA_OECONF = "<override me>"
 
-do_configure_prepend() {
-    if [ -e "${WORKDIR}/m4" ]; then
-        install -d "${S}/m4"
-        install "${WORKDIR}/m4/"*.m4 "${S}/m4"
-        aclocal -I m4
-    fi
-}
-
 python populate_packages_prepend () {
         for plugin_type in "engines loaders savers".split():
             bb.note( "splitting packages for evas %s..." % plugin_type )
@@ -42,16 +32,6 @@ do_install_append() {
     find "${D}" -name .debug -type d | xargs -iBLAH rm -rf "BLAH"
 }
 
-#do_stage_append() {
-#	cd src
-#	modules=`find modules -name ".libs"`
-#	for module in $modules
-#	do
-#		install -d ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH}
-#		install -m 0755 $module/module.so ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH}/module.so
-#	done
-#}
-
 FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
 FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
 FILES_${PN} = "${libdir}/libevas*.so*"
diff --git a/packages/efl1/evas_0.9.9.038.bb b/packages/efl1/evas_0.9.9.038.bb
deleted file mode 100644
index 79fdd42173..0000000000
--- a/packages/efl1/evas_0.9.9.038.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-require evas.inc
-PR = "r9"
-
-EXTRA_OECONF = "\
-		--x-includes=${STAGING_INCDIR}/X11  \
-		--x-libraries=${STAGING_LIBDIR} \
-		--enable-fb					\
-		--enable-directfb			\
-		--enable-buffer				\
-		--disable-software-ddraw	\
-		--disable-software-qtopia	\
-		--enable-software-x11		\
-		--enable-software-16-x11	\
-		--disable-software-xcb		\
-		--disable-gl-x11			\
-		--enable-xrender-x11		\
-		--disable-xrender-xcb		\
-		--disable-glitz-x11			\
-		--enable-image-loader-eet	\
-		--disable-image-loader-edb	\
-		--disable-image-loader-gif	\
-		--enable-image-loader-png	\
-		--enable-image-loader-jpeg	\
-		--enable-image-loader-tiff	\
-		--enable-image-loader-xpm	\
-		--enable-image-loader-svg	\
-		--enable-cpu-c				\
-		--enable-fontconfig			\
-		--enable-font-loader-eet	\
-		--enable-scale-sample		\
-		--enable-scale-smooth		\
-		--enable-convert-yuv		\
-		--enable-small-dither-mask	\
-		--disable-no-dither-mask	\
-		--disable-convert-8-rgb-332	\
-		--disable-convert-8-rgb-666	\
-		--disable-convert-8-rgb-232	\
-		--disable-convert-8-rgb-222	\
-		--disable-convert-8-rgb-221	\
-		--disable-convert-8-rgb-121	\
-		--disable-convert-8-rgb-111	\
-		--enable-convert-16-rgb-565	\
-		--disable-convert-16-rgb-555	\
-		--disable-convert-16-rgb-444	\
-		--disable-convert-16-rgb-ipq	\
-		--enable-convert-16-rgb-rot-0	\
-		--disable-convert-16-rgb-rot-90	\
-		--enable-convert-16-rgb-rot-270	\
-		--disable-convert-24-rgb-888	\
-		--disable-convert-24-bgr-888	\
-		--disable-convert-32-rgb-8888	\
-		--disable-convert-32-rgbx-8888	\
-		--disable-convert-32-bgr-8888	\
-		--disable-convert-32-bgrx-8888	\
-		--disable-convert-32-rgb-rot-0	\
-		--disable-convert-32-rgb-rot-90	\
-		--disable-convert-32-rgb-rot-270"
-
diff --git a/packages/efl1/evas_0.9.9.040.bb b/packages/efl1/evas_0.9.9.040.bb
new file mode 100644
index 0000000000..706a152764
--- /dev/null
+++ b/packages/efl1/evas_0.9.9.040.bb
@@ -0,0 +1,58 @@
+require evas.inc
+PR = "r9"
+
+EXTRA_OECONF = "\
+		--x-includes=${STAGING_INCDIR}/X11  \
+		--x-libraries=${STAGING_LIBDIR} \
+		--enable-fb					\
+		--enable-directfb			\
+		--enable-buffer				\
+		--disable-software-ddraw	\
+		--disable-software-qtopia	\
+		--enable-software-x11		\
+		--disable-software-16-x11	\
+		--disable-software-xcb		\
+		--disable-gl-x11			\
+		--enable-xrender-x11		\
+		--disable-xrender-xcb		\
+		--disable-glitz-x11			\
+		--enable-image-loader-eet	\
+		--disable-image-loader-edb	\
+		--disable-image-loader-gif	\
+		--enable-image-loader-png	\
+		--enable-image-loader-jpeg	\
+		--enable-image-loader-tiff	\
+		--enable-image-loader-xpm	\
+		--enable-image-loader-svg	\
+		--enable-cpu-c				\
+		--enable-fontconfig			\
+		--enable-font-loader-eet	\
+		--enable-scale-sample		\
+		--enable-scale-smooth		\
+		--enable-convert-yuv		\
+		--enable-small-dither-mask	\
+		--disable-no-dither-mask	\
+		--disable-convert-8-rgb-332	\
+		--disable-convert-8-rgb-666	\
+		--disable-convert-8-rgb-232	\
+		--disable-convert-8-rgb-222	\
+		--disable-convert-8-rgb-221	\
+		--disable-convert-8-rgb-121	\
+		--disable-convert-8-rgb-111	\
+		--enable-convert-16-rgb-565	\
+		--disable-convert-16-rgb-555	\
+		--disable-convert-16-rgb-444	\
+		--disable-convert-16-rgb-ipq	\
+		--enable-convert-16-rgb-rot-0	\
+		--disable-convert-16-rgb-rot-90	\
+		--enable-convert-16-rgb-rot-270	\
+		--disable-convert-24-rgb-888	\
+		--disable-convert-24-bgr-888	\
+		--disable-convert-32-rgb-8888	\
+		--disable-convert-32-rgbx-8888	\
+		--disable-convert-32-bgr-8888	\
+		--disable-convert-32-bgrx-8888	\
+		--disable-convert-32-rgb-rot-0	\
+		--disable-convert-32-rgb-rot-90	\
+		--disable-convert-32-rgb-rot-270"
+
diff --git a/packages/efl1/ewl_0.5.1.009.bb b/packages/efl1/ewl_0.5.1.009.bb
deleted file mode 100644
index 9d60a67b82..0000000000
--- a/packages/efl1/ewl_0.5.1.009.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "The Enlightened Widget Library, \
-a simple-to-use general purpose widget library \
-based on the enlightenment foundation libraries."
-DEPENDS = "evas ecore edje emotion efreet"
-RSUGGESTS_${PN} += "ewl-themes"
-LICENSE = "MIT"
-PR = "r0"
-
-inherit efl1
-
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/ewl-${PV}.tar.gz"
diff --git a/packages/efl1/ewl_0.5.1.010.bb b/packages/efl1/ewl_0.5.1.010.bb
new file mode 100644
index 0000000000..cece54b7d1
--- /dev/null
+++ b/packages/efl1/ewl_0.5.1.010.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "The Enlightened Widget Library, \
+a simple-to-use general purpose widget library \
+based on the enlightenment foundation libraries."
+DEPENDS = "evas ecore edje emotion efreet"
+RSUGGESTS_${PN} += "ewl-themes"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit efl1
diff --git a/packages/efl1/imlib2_1.4.0.001.bb b/packages/efl1/imlib2_1.4.0.001.bb
deleted file mode 100644
index 88b532c374..0000000000
--- a/packages/efl1/imlib2_1.4.0.001.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-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 efl1
-
-PR = "r1"
-
-PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
-FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
-FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/"
-FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}"
-FILES_${PN}-bin = "${bindir}"
-FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so"
-FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so"
-FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug"
-FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug"
diff --git a/packages/efl1/imlib2_1.4.0.002.bb b/packages/efl1/imlib2_1.4.0.002.bb
new file mode 100644
index 0000000000..7ac8f97dcc
--- /dev/null
+++ b/packages/efl1/imlib2_1.4.0.002.bb
@@ -0,0 +1,17 @@
+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"
+PR = "r0"
+
+inherit efl1
+
+PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
+FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
+FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/"
+FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}"
+FILES_${PN}-bin = "${bindir}"
+FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so"
+FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so"
+FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug"
+FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug"
-- 
cgit v1.2.3