efl, e17: update to newest versions, split e and efl bbclasses and use e for e17 packages, update preferred e versions

64 files changed, 202 insertions, 231 deletions

diff --git a/classes/e.bbclass b/classes/e.bbclass
new file mode 100644
index 0000000000..4485d1d847
--- /dev/null
+++ b/classes/e.bbclass
@@ -0,0 +1,40 @@
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+HOMEPAGE = "http://www.enlightenment.org"
+SECTION = "e/apps"
+
+inherit autotools pkgconfig binconfig
+
+do_prepsources () {
+  make clean distclean || true
+}
+addtask prepsources after do_fetch before do_unpack
+
+def binconfig_suffix(d):
+	import bb
+        return ["","-native"][bb.data.inherits_class('native', d)]
+
+export CURL_CONFIG		= "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}"
+export EDB_CONFIG		= "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}"
+export EET_CONFIG		= "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}"
+export EVAS_CONFIG		= "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}"
+export ECORE_CONFIG		= "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}"
+export EMBRYO_CONFIG		= "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}"
+export ENGRAVE_CONFIG		= "${STAGING_BINDIR}/engrave-config${@binconfig_suffix(d)}"
+export ENLIGHTENMENT_CONFIG	= "${STAGING_BINDIR}/enlightenment-config${@binconfig_suffix(d)}"
+export EPSILON_CONFIG		= "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}"
+export EPEG_CONFIG		= "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}"
+export ESMART_CONFIG		= "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}"
+export FREETYPE_CONFIG		= "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
+export IMLIB2_CONFIG		= "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}"
+
+do_compile_prepend() {
+	find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+	find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
+}
+
+E_CVS = "cvs://anonymous@anoncvs.enlightenment.org:/var/cvs/e"
+E_URI = "http://enlightenment.freedesktop.org/files"
+
+PACKAGES = "${PN} ${PN}-themes"
+FILES_${PN} = "${libdir}/lib*.so*"
+FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index e5968b9aec..9c490284c2 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -1,18 +1,11 @@
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-HOMEPAGE = "http://www.enlightenment.org"
+inherit e
+
 SECTION = "e/libs"
 
 SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
-SRC_URI = "http://enlightenment.freedesktop.org/files/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "${E_URI}/${SRCNAME}-${PV}.tar.gz"
 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"
 
@@ -20,29 +13,6 @@ libdirectory = "src/lib"
 libraries = "lib${SRCNAME}"
 headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h"
 
-def binconfig_suffix(d):
-	import bb
-        return ["","-native"][bb.data.inherits_class('native', d)]
-
-export CURL_CONFIG		= "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}"
-export EDB_CONFIG		= "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}"
-export EET_CONFIG		= "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}"
-export EVAS_CONFIG		= "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}"
-export ECORE_CONFIG		= "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}"
-export EMBRYO_CONFIG		= "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}"
-export ENGRAVE_CONFIG		= "${STAGING_BINDIR}/engrave-config${@binconfig_suffix(d)}"
-export ENLIGHTENMENT_CONFIG	= "${STAGING_BINDIR}/enlightenment-config${@binconfig_suffix(d)}"
-export EPSILON_CONFIG		= "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}"
-export EPEG_CONFIG		= "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}"
-export ESMART_CONFIG		= "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}"
-export FREETYPE_CONFIG		= "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
-export IMLIB2_CONFIG		= "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}"
-
-do_compile_prepend() {
-	find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-	find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
-}
-
 do_stage_append () {
 	for i in ${libraries}
 	do
@@ -73,9 +43,7 @@ do_stage_append () {
 	fi
 }
 
-PACKAGES = "${PN} ${PN}-themes ${PN}-dev ${PN}-examples "
-FILES_${PN} = "${libdir}/lib*.so*"
-FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
+PACKAGES = "${PN} ${PN}-themes ${PN}-dev ${PN}-examples"
 FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a"
 FILES_${PN}-examples = "${bindir} ${datadir}"
 
diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc
index 53f363bf3d..c8f246ff69 100644
--- a/conf/distro/preferred-e-versions.inc
+++ b/conf/distro/preferred-e-versions.inc
@@ -2,29 +2,29 @@
 # Specify which versions of E-related libraries and applications to build
 #
 
-PREFERRED_VERSION_e = "0.16.999.023"
-PREFERRED_VERSION_ecore-x11 = "0.9.9.023"
-PREFERRED_VERSION_ecore-native = "0.9.9.023"
-PREFERRED_VERSION_edb = "1.0.5.005"
-PREFERRED_VERSION_edb-native = "1.0.5.005"
-PREFERRED_VERSION_edje = "0.5.0.023"
-PREFERRED_VERSION_edje-native = "0.5.0.023"
-PREFERRED_VERSION_eet = "0.9.10.023"
-PREFERRED_VERSION_eet-native = "0.9.10.023"
-PREFERRED_VERSION_embryo = "0.9.1.023"
-PREFERRED_VERSION_embryo-native = "0.9.1.023"
+PREFERRED_VERSION_e = "0.16.999.025"
+PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
+PREFERRED_VERSION_ecore-native = "0.9.9.025"
+PREFERRED_VERSION_edb = "1.0.5.006"
+PREFERRED_VERSION_edb-native = "1.0.5.006"
+PREFERRED_VERSION_edje = "0.5.0.025"
+PREFERRED_VERSION_edje-native = "0.5.0.025"
+PREFERRED_VERSION_eet = "0.9.10.025"
+PREFERRED_VERSION_eet-native = "0.9.10.025"
+PREFERRED_VERSION_embryo = "0.9.1.025"
+PREFERRED_VERSION_embryo-native = "0.9.1.025"
 PREFERRED_VERSION_emotion = "0.0.1.004"
 PREFERRED_VERSION_emotion-native = "0.0.1.004"
-PREFERRED_VERSION_epeg = "0.9.0.005"
-PREFERRED_VERSION_epsilon = "0.3.0.005"
-PREFERRED_VERSION_esmart-x11 = "0.9.0.005"
-PREFERRED_VERSION_evas-x11 = "0.9.9.023"
-PREFERRED_VERSION_evas-native = "0.9.9.023"
-PREFERRED_VERSION_ewl = "0.0.4.005"
-PREFERRED_VERSION_imlib2-x11 = "1.2.1.010"
-PREFERRED_VERSION_imlib2-native = "1.2.1.010"
-PREFERRED_VERSION_e-wm = "0.16.999.023"
-PREFERRED_VERSION_entrance = "0.9.0.005"
+PREFERRED_VERSION_epeg = "0.9.0.006"
+PREFERRED_VERSION_epsilon = "0.3.0.006"
+PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
+PREFERRED_VERSION_evas-x11 = "0.9.9.025"
+PREFERRED_VERSION_evas-native = "0.9.9.025"
+PREFERRED_VERSION_ewl = "0.0.4.006"
+PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
+PREFERRED_VERSION_imlib2-native = "1.2.1.011"
+PREFERRED_VERSION_e-wm = "0.16.999.025"
+PREFERRED_VERSION_entrance = "0.9.0.006"
 
 PREFERRED_PROVIDER_virtual/evas = "evas-x11"
 PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
diff --git a/packages/e17/e-iconbar_20060128.bb b/packages/e17/e-iconbar_20060128.bb
index 7bfd2d0c7e..333f2406e1 100644
--- a/packages/e17/e-iconbar_20060128.bb
+++ b/packages/e17/e-iconbar_20060128.bb
@@ -1,14 +1,12 @@
 DESCRIPTION = "An Iconbar for the Enlightenment Window Manager"
 DEPENDS = "edb eet evas-x11 ecore-x11 edje esmart-x11 imlib2-x11"
 LICENSE = "MIT"
-SECTION = "e/apps"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r1"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/iconbar;date=${PV}"
-S = "${WORKDIR}/iconbar"
+inherit e
 
-inherit autotools
+SRC_URI = "${E_CVS};module=e17/apps/iconbar;date=${PV}"
+S = "${WORKDIR}/iconbar"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
diff --git a/packages/e17/e-modules_20060128.bb b/packages/e17/e-modules_20060128.bb
index 3a50083130..85929a6967 100644
--- a/packages/e17/e-modules_20060128.bb
+++ b/packages/e17/e-modules_20060128.bb
@@ -1,13 +1,11 @@
 DESCRIPTION = "Enlightenment Window Manager Extra Modules"
 DEPENDS = "ecore-x11 evas-x11 esmart-x11 edje eet e"
 LICENSE = "MIT"
-SECTION = "e/apps"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r1"
 
-inherit autotools
+inherit e
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/e_modules;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/apps/e_modules;date=${PV}"
 S = "${WORKDIR}/e_modules"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
diff --git a/packages/e17/e-utils_20060128.bb b/packages/e17/e-utils_20060128.bb
index 18cd7a93cf..3f1af895ae 100644
--- a/packages/e17/e-utils_20060128.bb
+++ b/packages/e17/e-utils_20060128.bb
@@ -1,13 +1,11 @@
 DESCRIPTION = "Enlightenment Window Manager Utilities"
 DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 e epsilon"
 LICENSE = "MIT"
-SECTION = "e/apps"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r1"
 
-inherit autotools
+inherit e
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/e_utils;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/apps/e_utils;date=${PV}"
 S = "${WORKDIR}/e_utils"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
diff --git a/packages/e17/e-wm_0.16.999.023.bb b/packages/e17/e-wm_0.16.999.025.bb
index f7f61ef747..ff7e322018 100644
--- a/packages/e17/e-wm_0.16.999.023.bb
+++ b/packages/e17/e-wm_0.16.999.025.bb
@@ -1,15 +1,15 @@
 DESCRIPTION = "E17 - the Enlightenment Window Mananger"
 DEPENDS = "evas-x11 ecore-x11 edje eet embryo e"
 LICENSE = "MIT"
-SECTION = "e/apps"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r3"
 
-SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz \
+inherit e
+
+SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \
            file://fix-configure.patch;patch=1 \
            file://remove-large-fonts.patch;patch=1 \
            file://Xsession.d/98enlightenment"
-	   
+
 #           cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926"
 #           file://disable-splash.patch;patch=1 \
 #           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \
@@ -20,8 +20,6 @@ SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz
 
 S = "${WORKDIR}/enlightenment-${PV}"
 
-inherit autotools
-
 PROFILE = "LORES_PDA"
 PROFILE_c7x0 = "HIRES_PDA"
 PROFILE_tosa = "HIRES_PDA"
@@ -48,3 +46,8 @@ do_install_append() {
 	install -d ${D}/${sysconfdir}/X11/Xsession.d
 	install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d
 }
+
+#pkg_postinst() {
+#    enlightenment_remote -menu-autoscroll-margin-set 5
+#    enlightenment_remote -menu-autoscroll-cursor-margin-set 5
+#}
\ No newline at end of file
diff --git a/packages/e17/e-wm_20060128.bb b/packages/e17/e-wm_20060128.bb
index b97253514d..a836284b5f 100644
--- a/packages/e17/e-wm_20060128.bb
+++ b/packages/e17/e-wm_20060128.bb
@@ -1,19 +1,17 @@
 DESCRIPTION = "E17 - the Enlightenment Window Mananger"
 DEPENDS = "evas-x11 ecore-x11 edje eet embryo e"
 LICENSE = "MIT"
-SECTION = "e/apps"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r3"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/e;date=${PV} \
+inherit e
+
+SRC_URI = "${E_CVS};module=e17/apps/e;date=${PV} \
            file://Xsession.d/98enlightenment \
            file://fix-configure.patch;patch=1 \
            file://remove-large-fonts.patch;patch=1"
 
 S = "${WORKDIR}/e"
 
-inherit autotools
-
 PROFILE = "LORES_PDA"
 PROFILE_c7x0 = "HIRES_PDA"
 PROFILE_tosa = "HIRES_PDA"
diff --git a/packages/e17/e17genmenu_2.0.2.bb b/packages/e17/e17genmenu_2.0.2.bb
index 8b43e5995a..49b139a213 100644
--- a/packages/e17/e17genmenu_2.0.2.bb
+++ b/packages/e17/e17genmenu_2.0.2.bb
@@ -1,16 +1,12 @@
 DESCRIPTION = "Convert Gnome or KDE menus to e17 menus"
-SECTION = "e/utils"
 DEPENDS = "e virtual/ecore virtual/evas eet engrave"
 LICENSE = "GPL"
 HOMEPAGE = "http://sourceforge.net/projects/e17genmenu"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r0"
 
-export EET_CONFIG		= "${STAGING_BINDIR}/eet-config"
-export EVAS_CONFIG		= "${STAGING_BINDIR}/evas-config"
-export ECORE_CONFIG		= "${STAGING_BINDIR}/ecore-config"
-export ENGRAVE_CONFIG		= "${STAGING_BINDIR}/engrave-config"
-export ENLIGHTENMENT_CONFIG	= "${STAGING_BINDIR}/enlightenment-config"
+inherit e
+
+SECTION = "e/utils"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e17genmenu/e17genmenu-2.0.2.tar.gz"
 
@@ -19,5 +15,3 @@ do_configure_prepend() {
 	find -type f | xargs sed -i 's:share/icons/hicolor/48x48/apps:share/pixmaps:'
 	find -type f | xargs sed -i 's:%s/share/pixmaps", GNOME_PREFIX, theme:%s/share/pixmaps", GNOME_PREFIX:'
 }
-
-inherit autotools
diff --git a/packages/e17/eclair_20060128.bb b/packages/e17/eclair_20060128.bb
index 7e1d1e5bda..36cf7c02ad 100644
--- a/packages/e17/eclair_20060128.bb
+++ b/packages/e17/eclair_20060128.bb
@@ -1,15 +1,12 @@
 DESCRIPTION = "Eclair is the E17 multi media player"
-SECTION = "e/apps"
 DEPENDS = "evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje libxine-x11 emotion esmart-x11 libxml2 sqlite3 taglibc"
 LICENSE = "MIT"
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r1"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/eclair;date=${PV}"
-S = "${WORKDIR}/eclair"
+inherit e
 
-inherit autotools
+SRC_URI = "${E_CVS};module=e17/apps/eclair;date=${PV}"
+S = "${WORKDIR}/eclair"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
diff --git a/packages/e17/engage_20060128.bb b/packages/e17/engage_20060128.bb
index bd925a969c..0bf9f80895 100644
--- a/packages/e17/engage_20060128.bb
+++ b/packages/e17/engage_20060128.bb
@@ -1,22 +1,15 @@
 DESCRIPTION = "Engage is the E17 icon dock"
 DEPENDS = "evas-x11 ecore-x11 esmart-x11 imlib2-x11 edje ewl e"
 LICENSE = "MIT"
-SECTION = "e/apps"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r2"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=misc/engage;date=${PV} \
+inherit e
+
+SRC_URI = "${E_CVS};module=misc/engage;date=${PV} \
            file://no-local-includes.patch;patch=1"
 S = "${WORKDIR}/engage"
 
-inherit autotools pkgconfig binconfig
-
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb
index 05023f7fa2..ffc07f7661 100644
--- a/packages/e17/entice_20060128.bb
+++ b/packages/e17/entice_20060128.bb
@@ -1,16 +1,13 @@
 DESCRIPTION = "Entice is the E17 picture viewer"
-SECTION = "e/apps"
 # can also depend on GIMP for editing
 DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11"
 LICENSE = "MIT"
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r1"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/entice;date=${PV}"
-S = "${WORKDIR}/entice"
+inherit e
 
-inherit autotools
+SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}"
+S = "${WORKDIR}/entice"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
diff --git a/packages/e17/entrance_0.9.0.005.bb b/packages/e17/entrance_0.9.0.006.bb
index c17d52c587..1b928b972c 100644
--- a/packages/e17/entrance_0.9.0.005.bb
+++ b/packages/e17/entrance_0.9.0.006.bb
@@ -1,26 +1,24 @@
 DESCRIPTION = "Entrance is the Enlightenment login manager"
-SECTION = "e/apps"
 LICENSE = "MIT"
 # can also use pam and crypt
 DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common login-manager"
 RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1 login-manager"
 HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r13"
 
-SRC_URI = "http://enlightenment.freedesktop.org/files/entrance-${PV}.tar.gz \
+inherit e
+
+SRC_URI = "${E_URI}/entrance-${PV}.tar.gz \
            file://config-db.patch;patch=1 \
            file://allow-missing-xsession.patch;patch=1 \
            file://run-Xinit.patch;patch=1 \
            file://set-display-env.patch;patch=1 \
            file://fix-auth-mode.patch;patch=1 \
            file://use-bash.patch;patch=1 \
-	   file://Sessions"
+           file://Sessions"
 
 S = "${WORKDIR}/entrance-${PV}"
 
-inherit autotools
-
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
                 --with-xsession=/etc/X11/Xsession \
                 --with-auth-mode=0"
diff --git a/packages/e17/entrance_20060128.bb b/packages/e17/entrance_20060128.bb
index b234664fe6..825a81cdec 100644
--- a/packages/e17/entrance_20060128.bb
+++ b/packages/e17/entrance_20060128.bb
@@ -1,26 +1,24 @@
 DESCRIPTION = "Entrance is the Enlightenment login manager"
-SECTION = "e/apps"
 LICENSE = "MIT"
 # can also use pam and crypt
 DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common"
 RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1"
 HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r11"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/entrance;date=${PV} \
+inherit e update-rc.d
+
+SRC_URI = "${E_CVS};module=e17/apps/entrance;date=${PV} \
            file://config-db.patch;patch=1 \
            file://allow-missing-xsession.patch;patch=1 \
            file://run-Xinit.patch;patch=1 \
            file://set-display-env.patch;patch=1 \
            file://fix-auth-mode.patch;patch=1 \
            file://use-bash.patch;patch=1 \
-	   file://Sessions"
+           file://Sessions"
 
 S = "${WORKDIR}/entrance"
 
-inherit autotools update-rc.d
-
 INITSCRIPT_NAME = "entrance"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
 
diff --git a/packages/e17/evidence_20060128.bb b/packages/e17/evidence_20060128.bb
index 5c24152b17..683ac8e536 100644
--- a/packages/e17/evidence_20060128.bb
+++ b/packages/e17/evidence_20060128.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "evidence, an enlightenemt file manager"
 LICENSE = "GPL"
-SECTION = "e"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 # can support dbus, avifile, libmpeg3
 DEPENDS = "pkgconfig gtk+ glib-2.0 ecore-x11 evas-x11 edb eet edje imlib2-x11 libpng epeg jpeg pcre curl taglib libvorbis libogg libxine-x11 emotion freetype"
 RDEPENDS += "examine"
 PR = "r0"
 
+inherit e
+
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/evidence;module=evidence;date=${PV}"
 S = "${WORKDIR}/evidence"
 
@@ -21,21 +21,9 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
 	--enable-browser-view \
 	--with-libxine=${STAGING_LIBDIR}"
 
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-
 do_compile_prepend() {
 	sed -i 's:LDFLAGS = :LDFLAGS = -L${STAGING_LIBDIR} :' ${S}/src/providers/vorbis/Makefile
 }
 
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
-export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config"
-export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config"
-export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config"
-export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config"
-
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
 
-inherit autotools pkgconfig binconfig
diff --git a/packages/e17/examine_20060128.bb b/packages/e17/examine_20060128.bb
index 45ceb65458..e689eb1712 100644
--- a/packages/e17/examine_20060128.bb
+++ b/packages/e17/examine_20060128.bb
@@ -1,20 +1,13 @@
 DESCRIPTION = "examine, the program configurator"
 DEPENDS = "virtual/ecore ewl"
 LICENSE = "MIT"
-SECTION = "e/apps"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r0"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/examine;date=${PV}"
+inherit e
+
+SRC_URI = "${E_CVS};module=e17/apps/examine;date=${PV}"
 S = "${WORKDIR}/examine"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
-inherit autotools pkgconfig binconfig
-
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/efl/e_0.16.999.023.bb b/packages/efl/e_0.16.999.025.bb
index 0f400d51cc..bd40c68b0e 100644
--- a/packages/efl/e_0.16.999.023.bb
+++ b/packages/efl/e_0.16.999.025.bb
@@ -5,7 +5,7 @@ PR = "r2"
 
 inherit efl
 
-SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz"
+SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz"
 S = "${WORKDIR}/enlightenment-${PV}"
 
 PROFILE = "LORES_PDA"
diff --git a/packages/efl/e_20060128.bb b/packages/efl/e_20060128.bb
index 495b647101..132da0c23a 100644
--- a/packages/efl/e_20060128.bb
+++ b/packages/efl/e_20060128.bb
@@ -5,7 +5,7 @@ PR = "r1"
 
 inherit efl
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/e;date=${PV} \
+SRC_URI = "${E_CVS};module=e17/apps/e;date=${PV} \
            file://fix-configure.patch;patch=1"
 S = "${WORKDIR}/e"
 
diff --git a/packages/efl/ecore-fb_0.9.9.023.bb b/packages/efl/ecore-fb_0.9.9.025.bb
index a5a843aeb4..a957c5dd8c 100644
--- a/packages/efl/ecore-fb_0.9.9.023.bb
+++ b/packages/efl/ecore-fb_0.9.9.025.bb
@@ -7,6 +7,7 @@ EXTRA_OECONF = "--enable-ecore-fb \
 		--enable-poll \
 		--enable-ecore-dbus \
 		--enable-ecore-evas \
+        --enable-ecore-evas-buffer \
 		--enable-ecore-evas-fb \
 		--disable-ecore-evas-x \
 		--disable-ecore-evas-xrender \
diff --git a/packages/efl/ecore-fb_20060128.bb b/packages/efl/ecore-fb_20060128.bb
index 4badfa42ec..5bffca1295 100644
--- a/packages/efl/ecore-fb_20060128.bb
+++ b/packages/efl/ecore-fb_20060128.bb
@@ -1,7 +1,7 @@
 include ecore.inc
 PR = "r1"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/ecore;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/ecore;date=${PV}"
 S = "${WORKDIR}/ecore"
 
 ### add tslib support
diff --git a/packages/efl/ecore-native_0.9.9.023.bb b/packages/efl/ecore-native_0.9.9.025.bb
index 299470841c..299470841c 100644
--- a/packages/efl/ecore-native_0.9.9.023.bb
+++ b/packages/efl/ecore-native_0.9.9.025.bb
diff --git a/packages/efl/ecore-native_20060128.bb b/packages/efl/ecore-native_20060128.bb
index 5eb8541fdc..a4d67bf056 100644
--- a/packages/efl/ecore-native_20060128.bb
+++ b/packages/efl/ecore-native_20060128.bb
@@ -1,7 +1,7 @@
 include ecore.inc
 PR = "r1"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/ecore;date=${PV} \
+SRC_URI = "${E_CVS};module=e17/libs/ecore;date=${PV} \
            file://remove-tslib-configure.patch;patch=1"
 S = "${WORKDIR}/ecore"
 
diff --git a/packages/efl/ecore-x11_0.9.9.023.bb b/packages/efl/ecore-x11_0.9.9.025.bb
index 40527561aa..3a88ad229b 100644
--- a/packages/efl/ecore-x11_0.9.9.023.bb
+++ b/packages/efl/ecore-x11_0.9.9.025.bb
@@ -10,6 +10,7 @@ EXTRA_OECONF = "--enable-ecore-fb \
 		--enable-ecore-dbus \
 		--enable-ecore-evas-fb \
 		--enable-ecore-evas-x \
+        --enable-ecore-evas-buffer \
 		--disable-ecore-evas-gl \
 		--enable-ecore-con \
 		--enable-ecore-ipc \
diff --git a/packages/efl/ecore-x11_20060128.bb b/packages/efl/ecore-x11_20060128.bb
index cc4fc76de7..7b9f3a6f76 100644
--- a/packages/efl/ecore-x11_20060128.bb
+++ b/packages/efl/ecore-x11_20060128.bb
@@ -2,7 +2,7 @@ include ecore.inc
 DEPENDS += "evas-x11"
 PR = "r2"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/ecore;date=${PV} \
+SRC_URI = "${E_CVS};module=e17/libs/ecore;date=${PV} \
            file://evas-x11-include.patch;patch=1 \
            file://remove-tslib-configure.patch;patch=1"
 S = "${WORKDIR}/ecore"
diff --git a/packages/efl/edb-native_1.0.5.005.bb b/packages/efl/edb-native_1.0.5.006.bb
index d83a3b77c6..d83a3b77c6 100644
--- a/packages/efl/edb-native_1.0.5.005.bb
+++ b/packages/efl/edb-native_1.0.5.006.bb
diff --git a/packages/efl/edb-utils_1.0.5.005.bb b/packages/efl/edb-utils_1.0.5.006.bb
index 401d0e7e46..8d47e068a7 100644
--- a/packages/efl/edb-utils_1.0.5.005.bb
+++ b/packages/efl/edb-utils_1.0.5.006.bb
@@ -12,7 +12,7 @@ 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"
+SRC_URI = "${E_URI}/edb-${PV}.tar.gz"
 S = "${WORKDIR}/edb-${PV}"
 
 libraries = ""
diff --git a/packages/efl/edb_1.0.5.005.bb b/packages/efl/edb_1.0.5.006.bb
index a152530b47..a152530b47 100644
--- a/packages/efl/edb_1.0.5.005.bb
+++ b/packages/efl/edb_1.0.5.006.bb
diff --git a/packages/efl/edb_20060128.bb b/packages/efl/edb_20060128.bb
index 0d0d899037..8b1f39ed88 100644
--- a/packages/efl/edb_20060128.bb
+++ b/packages/efl/edb_20060128.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 inherit efl
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/edb;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/edb;date=${PV}"
 S = "${WORKDIR}/edb"
 
 EXTRA_OECONF += "--disable-gtk"
diff --git a/packages/efl/edje-native_0.5.0.023.bb b/packages/efl/edje-native_0.5.0.025.bb
index 44b4e80c20..5e7bed336d 100644
--- a/packages/efl/edje-native_0.5.0.023.bb
+++ b/packages/efl/edje-native_0.5.0.025.bb
@@ -7,8 +7,7 @@ inherit 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 \
-  --with-evas-config=${STAGING_BINDIR}/evas-config-native	\
+EXTRA_OECONF = "--with-evas-config=${STAGING_BINDIR}/evas-config-native	\
   --with-ecore-config=${STAGING_BINDIR}/ecore-config-native	\
   --with-eet-config=${STAGING_BINDIR}/eet-config-native		\
   --with-embryo-config=${STAGING_BINDIR}/embryo-config-native	\
diff --git a/packages/efl/edje-utils_0.5.0.023.bb b/packages/efl/edje-utils_0.5.0.025.bb
index 837157ee3e..f8eb917e4d 100644
--- a/packages/efl/edje-utils_0.5.0.023.bb
+++ b/packages/efl/edje-utils_0.5.0.025.bb
@@ -9,8 +9,8 @@ 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"
+SRC_URI = "${E_URI}/edje-${PV}.tar.gz \
+           ${E_CVS};module=e17/libs/edje/m4;date=20060101"
 S = "${WORKDIR}/edje-${PV}"
 
 libraries = ""
diff --git a/packages/efl/edje_0.5.0.023.bb b/packages/efl/edje_0.5.0.025.bb
index 43e135ac5d..0d4acab003 100644
--- a/packages/efl/edje_0.5.0.023.bb
+++ b/packages/efl/edje_0.5.0.025.bb
@@ -18,7 +18,7 @@ FILES_${PN}-examples = "${datadir}/edje/data/images ${datadir}/edje/data/src ${d
 
 FILES_${SRCNAME}-themes = ""
 
-SRC_URI += "cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101"
+SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101"
 
 LEAD_SONAME = "libedje.so"
 
diff --git a/packages/efl/edje_20060128.bb b/packages/efl/edje_20060128.bb
index 9a23201f80..e4c1d4f51b 100644
--- a/packages/efl/edje_20060128.bb
+++ b/packages/efl/edje_20060128.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 inherit efl
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/edje;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/edje;date=${PV}"
 S = "${WORKDIR}/edje"
 
 LEAD_SONAME = "libedje.so"
diff --git a/packages/efl/eet-native_0.9.10.023.bb b/packages/efl/eet-native_0.9.10.025.bb
index fa20c9fb30..fa20c9fb30 100644
--- a/packages/efl/eet-native_0.9.10.023.bb
+++ b/packages/efl/eet-native_0.9.10.025.bb
diff --git a/packages/efl/eet_0.9.10.023.bb b/packages/efl/eet_0.9.10.025.bb
index 6e6032e098..6e6032e098 100644
--- a/packages/efl/eet_0.9.10.023.bb
+++ b/packages/efl/eet_0.9.10.025.bb
diff --git a/packages/efl/eet_20060128.bb b/packages/efl/eet_20060128.bb
index 70dde944fa..883c122a94 100644
--- a/packages/efl/eet_20060128.bb
+++ b/packages/efl/eet_20060128.bb
@@ -8,5 +8,5 @@ PR = "r1"
 
 inherit efl
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/eet;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/eet;date=${PV}"
 S = "${WORKDIR}/eet"
diff --git a/packages/efl/embryo-native_0.9.1.023.bb b/packages/efl/embryo-native_0.9.1.025.bb
index a33adb7bd2..a33adb7bd2 100644
--- a/packages/efl/embryo-native_0.9.1.023.bb
+++ b/packages/efl/embryo-native_0.9.1.025.bb
diff --git a/packages/efl/embryo-utils_0.9.1.023.bb b/packages/efl/embryo-utils_0.9.1.025.bb
index 7899e4aa2f..d507c53cce 100644
--- a/packages/efl/embryo-utils_0.9.1.023.bb
+++ b/packages/efl/embryo-utils_0.9.1.025.bb
@@ -8,7 +8,7 @@ PR = "r4"
 
 inherit efl
 
-SRC_URI = "http://enlightenment.freedesktop.org/files/embryo-${PV}.tar.gz"
+SRC_URI = "${E_URI}/embryo-${PV}.tar.gz"
 S = "${WORKDIR}/embryo-${PV}"
 
 PACKAGES = "embryo-utils"
diff --git a/packages/efl/embryo_0.9.1.023.bb b/packages/efl/embryo_0.9.1.025.bb
index 0009c0a149..0009c0a149 100644
--- a/packages/efl/embryo_0.9.1.023.bb
+++ b/packages/efl/embryo_0.9.1.025.bb
diff --git a/packages/efl/embryo_20060128.bb b/packages/efl/embryo_20060128.bb
index 58ff67869b..bdf208aeda 100644
--- a/packages/efl/embryo_20060128.bb
+++ b/packages/efl/embryo_20060128.bb
@@ -8,5 +8,5 @@ PR = "r1"
 
 inherit efl
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/embryo;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/embryo;date=${PV}"
 S = "${WORKDIR}/embryo"
diff --git a/packages/efl/emotion_20060128.bb b/packages/efl/emotion_20060128.bb
index a567c030cc..90847f297a 100644
--- a/packages/efl/emotion_20060128.bb
+++ b/packages/efl/emotion_20060128.bb
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1"
 
 inherit efl
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/emotion;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/emotion;date=${PV}"
 S = "${WORKDIR}/emotion"
 
 PACKAGES += "emotion-plugins"
diff --git a/packages/efl/engrave_20060128.bb b/packages/efl/engrave_20060128.bb
index e3b64a82d3..63eb24eb1f 100644
--- a/packages/efl/engrave_20060128.bb
+++ b/packages/efl/engrave_20060128.bb
@@ -5,7 +5,7 @@ DEPENDS = "virtual/evas virtual/ecore"
 
 inherit efl
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/engrave;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/engrave;date=${PV}"
 S = "${WORKDIR}/engrave"
 
 do_stage_append() {
diff --git a/packages/efl/epeg_0.9.0.005.bb b/packages/efl/epeg_0.9.0.006.bb
index c35ec63606..c35ec63606 100644
--- a/packages/efl/epeg_0.9.0.005.bb
+++ b/packages/efl/epeg_0.9.0.006.bb
diff --git a/packages/efl/epeg_20060128.bb b/packages/efl/epeg_20060128.bb
index 36ababb26f..df63c0f335 100644
--- a/packages/efl/epeg_20060128.bb
+++ b/packages/efl/epeg_20060128.bb
@@ -4,5 +4,5 @@ DEPENDS = "jpeg"
 
 inherit efl
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/epeg;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/epeg;date=${PV}"
 S = "${WORKDIR}/epeg"
diff --git a/packages/efl/epsilon_0.3.0.005.bb b/packages/efl/epsilon_0.3.0.006.bb
index d454a538a6..58c0f02a45 100644
--- a/packages/efl/epsilon_0.3.0.005.bb
+++ b/packages/efl/epsilon_0.3.0.006.bb
@@ -6,7 +6,7 @@ DEPENDS = "virtual/imlib2 epeg libpng virtual/evas virtual/ecore perl-native edj
 inherit efl
 
 SRC_URI += "file://compile-fix.patch;patch=1 \
-            cvs://anonymous@thinktux.net/root;module=e17/libs/epsilon/m4;date=20060101"
+            ${E_CVS};module=e17/libs/epsilon/m4;date=20060101"
 
 do_configure_prepend() {
 	install -d "${S}/m4"
diff --git a/packages/efl/esmart-fb_0.9.0.005.bb b/packages/efl/esmart-fb_0.9.0.006.bb
index 35bef239ee..35bef239ee 100644
--- a/packages/efl/esmart-fb_0.9.0.005.bb
+++ b/packages/efl/esmart-fb_0.9.0.006.bb
diff --git a/packages/efl/esmart-fb_20060128.bb b/packages/efl/esmart-fb_20060128.bb
index 302fb95159..655a61d06f 100644
--- a/packages/efl/esmart-fb_20060128.bb
+++ b/packages/efl/esmart-fb_20060128.bb
@@ -1,7 +1,7 @@
 include esmart.inc
 PR = "r0"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/esmart;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/esmart;date=${PV}"
 S = "${WORKDIR}/esmart"
 
 SRC_URI += "file://disable-x-only-features.patch;patch=1 \
diff --git a/packages/efl/esmart-x11_0.9.0.005.bb b/packages/efl/esmart-x11_0.9.0.006.bb
index cb5cc1da91..cb5cc1da91 100644
--- a/packages/efl/esmart-x11_0.9.0.005.bb
+++ b/packages/efl/esmart-x11_0.9.0.006.bb
diff --git a/packages/efl/esmart-x11_20060128.bb b/packages/efl/esmart-x11_20060128.bb
index cccb7c36ff..076f4bf22f 100644
--- a/packages/efl/esmart-x11_20060128.bb
+++ b/packages/efl/esmart-x11_20060128.bb
@@ -1,7 +1,7 @@
 include esmart.inc
 PR = "r2"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/esmart;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/esmart;date=${PV}"
 SRC_URI += "file://ecore-fix.patch;patch=1 \
             file://include-stdio.patch;patch=1 \
             file://compile-fix.patch;patch=1"
diff --git a/packages/efl/etox_20060128.bb b/packages/efl/etox_20060128.bb
index d460479c4f..fa51dba3c4 100644
--- a/packages/efl/etox_20060128.bb
+++ b/packages/efl/etox_20060128.bb
@@ -7,7 +7,7 @@ PR = "r1"
 
 inherit efl
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/etox;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/etox;date=${PV}"
 S = "${WORKDIR}/etox"
 
 libdirectory = "src"
diff --git a/packages/efl/evas-fb_0.9.9.023.bb b/packages/efl/evas-fb_0.9.9.023.bb
deleted file mode 100644
index b0c9d5bdb6..0000000000
--- a/packages/efl/evas-fb_0.9.9.023.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-include evas.inc
-DEPENDS = "freetype libpng jpeg eet"
-PR = "r2"
-
-EXTRA_OECONF = "--enable-fb         \
-		--disable-directfb          \
-		--disable-buffer            \
-		--disable-software-qtopia   \
-		--disable-software-x11      \
-		--disable-gl-x11            \
-		--disable-xrender-x11       \
-		--enable-image-loader-eet   \
-		--disable-image-loader-edb  \
-		--enable-image-loader-png   \
-		--enable-image-loader-jpeg  \
-		--enable-small-dither-mask  \
-		--enable-cpu-c              \
-		--enable-font-loader-eet    \
-		--enable-scale-sample       \
-		--enable-scale-smooth       \
-		--enable-convert-yuv        \
-		--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"
-
-headers = "Evas_Engine_Buffer.h \
-           Evas_Engine_FB.h \
-           Evas.h"
diff --git a/packages/efl/evas-fb_0.9.9.025.bb b/packages/efl/evas-fb_0.9.9.025.bb
new file mode 100644
index 0000000000..a7b1bd4029
--- /dev/null
+++ b/packages/efl/evas-fb_0.9.9.025.bb
@@ -0,0 +1,48 @@
+include evas.inc
+DEPENDS = "freetype libpng jpeg eet"
+PR = "r2"
+
+EXTRA_OECONF = "--enable-fb         \
+		--disable-directfb          \
+		--enable-buffer             \
+		--disable-software-qtopia   \
+		--disable-software-x11      \
+		--disable-gl-x11            \
+		--disable-xrender-x11       \
+		--enable-image-loader-eet   \
+		--disable-image-loader-edb  \
+		--enable-image-loader-png   \
+		--enable-image-loader-jpeg  \
+		--enable-small-dither-mask  \
+		--enable-cpu-c              \
+		--enable-font-loader-eet    \
+		--enable-scale-sample       \
+		--enable-scale-smooth       \
+		--enable-convert-yuv        \
+		--enable-convert-8-rgb-332 \
+		--enable-convert-8-rgb-666 \
+		--enable-convert-8-rgb-232 \
+		--enable-convert-8-rgb-222 \
+		--enable-convert-8-rgb-221 \
+		--enable-convert-8-rgb-121 \
+		--enable-convert-8-rgb-111 \
+		--enable-convert-16-rgb-565 \
+		--enable-convert-16-rgb-555	\
+		--enable-convert-16-rgb-444	\
+		--enable-convert-16-rgb-ipq	\
+		--enable-convert-16-rgb-rot-0	\
+		--enable-convert-16-rgb-rot-90	\
+		--enable-convert-16-rgb-rot-270	\
+		--enable-convert-24-rgb-888	\
+		--enable-convert-24-bgr-888	\
+		--enable-convert-32-rgb-8888	\
+		--enable-convert-32-rgbx-8888	\
+		--enable-convert-32-bgr-8888	\
+		--enable-convert-32-bgrx-8888	\
+		--enable-convert-32-rgb-rot-0	\
+		--enable-convert-32-rgb-rot-90	\
+		--enable-convert-32-rgb-rot-270"
+
+headers = "../modules/engines/buffer/Evas_Engine_Buffer.h \
+           ../modules/engines/fb/Evas_Engine_FB.h \
+           Evas.h"
diff --git a/packages/efl/evas-fb_20060113.bb b/packages/efl/evas-fb_20060113.bb
index e3bbccc383..3162ab147a 100644
--- a/packages/efl/evas-fb_20060113.bb
+++ b/packages/efl/evas-fb_20060113.bb
@@ -2,7 +2,7 @@ include evas.inc
 DEPENDS = "freetype libpng jpeg eet"
 PR = "r0"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/evas;date=${PV} \
+SRC_URI = "${E_CVS};module=e17/libs/evas;date=${PV} \
            file://pkg.m4"
 S = "${WORKDIR}/evas"
 
diff --git a/packages/efl/evas-native_0.9.9.023.bb b/packages/efl/evas-native_0.9.9.025.bb
index cb4336dfab..fafaaf2c62 100644
--- a/packages/efl/evas-native_0.9.9.023.bb
+++ b/packages/efl/evas-native_0.9.9.025.bb
@@ -2,4 +2,7 @@ include evas-fb_${PV}.bb
 inherit native
 DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
 PROVIDES = "evas-native"
-EXTRA_OECONF += "--enable-buffer"
+
+do_install() {
+  autotools_do_install
+}
\ 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.025.bb
index 4b833d8d9c..125dfb0c97 100644
--- a/packages/efl/evas-x11_0.9.9.023.bb
+++ b/packages/efl/evas-x11_0.9.9.025.bb
@@ -44,9 +44,9 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--disable-convert-32-rgb-rot-90	\
 		--disable-convert-32-rgb-rot-270"
 
-headers = "Evas_Engine_Software_X11.h \
-           Evas_Engine_XRender_X11.h \
-           Evas_Engine_Buffer.h \
-           Evas_Engine_FB.h \
+headers = "../modules/engines/software_x11/Evas_Engine_Software_X11.h \
+           ../modules/engines/xrender_x11/Evas_Engine_XRender_X11.h \
+           ../modules/engines/buffer/Evas_Engine_Buffer.h \
+           ../modules/engines/fb/Evas_Engine_FB.h \
            Evas.h"
 
diff --git a/packages/efl/evas-x11_20060113.bb b/packages/efl/evas-x11_20060113.bb
index dab078a9bc..8925920fcf 100644
--- a/packages/efl/evas-x11_20060113.bb
+++ b/packages/efl/evas-x11_20060113.bb
@@ -2,7 +2,7 @@ include evas.inc
 DEPENDS += "libx11 libxext freetype"
 PR = "r4"
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/evas;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/evas;date=${PV}"
 S = "${WORKDIR}/evas"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 33625e812d..3199453d31 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -30,4 +30,5 @@ do_configure_prepend() {
 }
 
 headers = "<override me>"
-libraries = "libevas"
\ No newline at end of file
+libraries = "libevas"
+FILES_${PN} += "/usr/lib/evas/"
\ No newline at end of file
diff --git a/packages/efl/ewl_0.0.4.005.bb b/packages/efl/ewl_0.0.4.006.bb
index 85b85e0c05..85b85e0c05 100644
--- a/packages/efl/ewl_0.0.4.005.bb
+++ b/packages/efl/ewl_0.0.4.006.bb
diff --git a/packages/efl/imlib2-fb_1.2.1.010.bb b/packages/efl/imlib2-fb_1.2.1.011.bb
index 09fecdaf8b..09fecdaf8b 100644
--- a/packages/efl/imlib2-fb_1.2.1.010.bb
+++ b/packages/efl/imlib2-fb_1.2.1.011.bb
diff --git a/packages/efl/imlib2-fb_20060128.bb b/packages/efl/imlib2-fb_20060128.bb
index 88f988e8a0..68357df7af 100644
--- a/packages/efl/imlib2-fb_20060128.bb
+++ b/packages/efl/imlib2-fb_20060128.bb
@@ -1,6 +1,6 @@
 include imlib2.inc
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/imlib2;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/imlib2;date=${PV}"
 S = "${WORKDIR}/imlib2"
 
 EXTRA_OECONF = "--without-x \
diff --git a/packages/efl/imlib2-native_1.2.1.010.bb b/packages/efl/imlib2-native_1.2.1.011.bb
index 6f8ebe477a..6f8ebe477a 100644
--- a/packages/efl/imlib2-native_1.2.1.010.bb
+++ b/packages/efl/imlib2-native_1.2.1.011.bb
diff --git a/packages/efl/imlib2-native_20060128.bb b/packages/efl/imlib2-native_20060128.bb
index 11c2fa4b89..de546add72 100644
--- a/packages/efl/imlib2-native_20060128.bb
+++ b/packages/efl/imlib2-native_20060128.bb
@@ -1,6 +1,6 @@
 include imlib2.inc
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/imlib2;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/imlib2;date=${PV}"
 S = "${WORKDIR}/imlib2"
 
 inherit native
diff --git a/packages/efl/imlib2-x11_1.2.1.010.bb b/packages/efl/imlib2-x11_1.2.1.011.bb
index fec8b32205..fec8b32205 100644
--- a/packages/efl/imlib2-x11_1.2.1.010.bb
+++ b/packages/efl/imlib2-x11_1.2.1.011.bb
diff --git a/packages/efl/imlib2-x11_20060128.bb b/packages/efl/imlib2-x11_20060128.bb
index f77fa6498c..3012466b3b 100644
--- a/packages/efl/imlib2-x11_20060128.bb
+++ b/packages/efl/imlib2-x11_20060128.bb
@@ -1,6 +1,6 @@
 include imlib2.inc
 
-SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/imlib2;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/libs/imlib2;date=${PV}"
 S = "${WORKDIR}/imlib2"
 
 DEPENDS += "libx11 libxext"
diff --git a/packages/meta/e-image-core.bb b/packages/meta/e-image-core.bb
index 46957d1c53..f20f6c61f1 100644
--- a/packages/meta/e-image-core.bb
+++ b/packages/meta/e-image-core.bb
@@ -5,13 +5,18 @@ PR = "r1"
 export IMAGE_BASENAME = "e-image-core"
 export IMAGE_LINGUAS = ""
 
-DEPENDS = "task-bootstrap xserver-kdrive task-e-x11-core"
+DEPENDS = "task-bootstrap \
+           xserver-kdrive \
+           task-e-x11-core \
+           glibc-charmap-utf-8 \
+           glibc-localedata-i18n"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/evas = "evas-x11"
 PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
 PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
 PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
+PREFERRED_PROVIDER_libx11 = "libx11"
 
 export IPKG_INSTALL = "task-bootstrap task-e-x11-core xserver-kdrive-fbdev"