merge of 05f59d0250f45dd58a55c7c2c2889b58d28951ef

     and 46041f133cbc74bb45da74974398099f4df06233

55 files changed, 437 insertions, 95 deletions

diff --git a/packages/e17/e-iconbar_20050926.bb b/packages/e17/e-iconbar_20060101.bb
index ad9f004a8b..7bfd2d0c7e 100644
--- a/packages/e17/e-iconbar_20050926.bb
+++ b/packages/e17/e-iconbar_20060101.bb
@@ -3,10 +3,9 @@ DEPENDS = "edb eet evas-x11 ecore-x11 edje esmart-x11 imlib2-x11"
 LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-SRCDATE = "${PV}"
 PR = "r1"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/iconbar"
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/iconbar;date=${PV}"
 S = "${WORKDIR}/iconbar"
 
 inherit autotools
diff --git a/packages/e17/e-modules_20050926.bb b/packages/e17/e-modules_20060101.bb
index f6699b887b..3a50083130 100644
--- a/packages/e17/e-modules_20050926.bb
+++ b/packages/e17/e-modules_20060101.bb
@@ -3,12 +3,11 @@ DEPENDS = "ecore-x11 evas-x11 esmart-x11 edje eet e"
 LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-SRCDATE = "${PV}"
 PR = "r1"
 
 inherit autotools
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_modules"
+SRC_URI = "cvs://anonymous@thinktux.net/root;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_20051009.bb b/packages/e17/e-utils_20060101.bb
index 6f1260f8fe..18cd7a93cf 100644
--- a/packages/e17/e-utils_20051009.bb
+++ b/packages/e17/e-utils_20060101.bb
@@ -3,12 +3,11 @@ DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtua
 LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-SRCDATE = "${PV}"
 PR = "r1"
 
 inherit autotools
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_utils"
+SRC_URI = "cvs://anonymous@thinktux.net/root;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.018.bb b/packages/e17/e-wm_0.16.999.022.bb
index 25915b2872..60d5fe6571 100644
--- a/packages/e17/e-wm_0.16.999.018.bb
+++ b/packages/e17/e-wm_0.16.999.022.bb
@@ -3,7 +3,6 @@ DEPENDS = "evas-x11 ecore-x11 edje eet embryo e"
 LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-SRCDATE = "${PV}"
 PR = "r3"
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz \
@@ -11,7 +10,7 @@ SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz
            file://remove-large-fonts.patch;patch=1 \
            file://disable-splash.patch;patch=1 \
            file://Xsession.d/98enlightenment \
-           cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e/data/themes;date=20050926"
+           cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926"
 #           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \
 #           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \
 #           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \
diff --git a/packages/e17/e-wm_20050926.bb b/packages/e17/e-wm_20060101.bb
index 5fec497c4f..c3179e18d0 100644
--- a/packages/e17/e-wm_20050926.bb
+++ b/packages/e17/e-wm_20060101.bb
@@ -3,15 +3,11 @@ DEPENDS = "evas-x11 ecore-x11 edje eet embryo e"
 LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-SRCDATE = "${PV}"
 PR = "r3"
 
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/e;date=${PV} \
            file://Xsession.d/98enlightenment \
            file://fix-configure.patch;patch=1 \
-           file://add-menu-autoscroll-options.patch;patch=1 \
            file://remove-large-fonts.patch;patch=1"
 S = "${WORKDIR}/e"
 
diff --git a/packages/e17/eclair_20050926.bb b/packages/e17/eclair_20060101.bb
index 0a4b78d397..7e1d1e5bda 100644
--- a/packages/e17/eclair_20050926.bb
+++ b/packages/e17/eclair_20060101.bb
@@ -4,10 +4,9 @@ DEPENDS = "evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje libxine-x11 emo
 LICENSE = "MIT"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-SRCDATE = "${PV}"
 PR = "r1"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/eclair"
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/eclair;date=${PV}"
 S = "${WORKDIR}/eclair"
 
 inherit autotools
diff --git a/packages/e17/engage_20050926.bb b/packages/e17/engage_20060101.bb
index 077858d8eb..bd925a969c 100644
--- a/packages/e17/engage_20050926.bb
+++ b/packages/e17/engage_20060101.bb
@@ -5,7 +5,7 @@ SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r2"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage \
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=misc/engage;date=${PV} \
            file://no-local-includes.patch;patch=1"
 S = "${WORKDIR}/engage"
 
diff --git a/packages/e17/entice_20050926.bb b/packages/e17/entice_20060101.bb
index 44f668de1e..05023f7fa2 100644
--- a/packages/e17/entice_20050926.bb
+++ b/packages/e17/entice_20060101.bb
@@ -5,10 +5,9 @@ DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11"
 LICENSE = "MIT"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-SRCDATE = "${PV}"
 PR = "r1"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entice"
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/entice;date=${PV}"
 S = "${WORKDIR}/entice"
 
 inherit autotools
diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch
index c909201882..83ed3acf84 100644
--- a/packages/e17/entrance/config-db.patch
+++ b/packages/e17/entrance/config-db.patch
@@ -1,52 +1,43 @@
-diff -Nur entrance~/data/config/build_config.sh.in entrance/data/config/build_config.sh.in
---- entrance~/data/config/build_config.sh.in	2005-09-29 14:58:41.000000000 -0700
-+++ entrance/data/config/build_config.sh.in	2005-09-29 15:01:04.000000000 -0700
-@@ -3,7 +3,7 @@
- rm -f $DB
+--- entrance/data/config/build_config.sh.in.~1.18.~	2006-01-11 18:46:48.000000000 -0800
++++ entrance/data/config/build_config.sh.in	2006-01-11 21:52:54.000000000 -0800
+@@ -18,29 +18,14 @@
+ #ecore_config -c $DB -k /entrance/fonts/0/-s -s "/usr/share/fonts/truetype/"
+ #ecore_config -c $DB -k /entrance/fonts/1/-s -s "/usr/X11R6/lib/X11/fonts/Truetype/"
+ ecore_config -c $DB -k /entrance/greeting/before -s "Welcome to"
+-ecore_config -c $DB -k /entrance/greeting/after -s ""
+-ecore_config -c $DB -k /entrance/session/count -i 7
+-ecore_config -c $DB -k /entrance/session/0/session -s "default"
++ecore_config -c $DB -k /entrance/greeting/after -s " e17/OE"
++ecore_config -c $DB -k /entrance/session/count -i 2
++ecore_config -c $DB -k /entrance/session/0/session -s "/etc/X11/Sessions/Enlightenment"
+ ecore_config -c $DB -k /entrance/session/0/title -s "Default"
+ ecore_config -c $DB -k /entrance/session/0/icon -s "default.png"
+ ecore_config -c $DB -k /entrance/session/1/icon -s "enlightenment.png"
+ ecore_config -c $DB -k /entrance/session/1/title -s "E17"
+-ecore_config -c $DB -k /entrance/session/1/session -s "@prefix@/bin/enlightenment"
+-ecore_config -c $DB -k /entrance/session/2/session -s "kde"
+-ecore_config -c $DB -k /entrance/session/2/title -s "KDE"
+-ecore_config -c $DB -k /entrance/session/2/icon -s "kde.png"
+-ecore_config -c $DB -k /entrance/session/3/session -s "gnome"
+-ecore_config -c $DB -k /entrance/session/3/title -s "Gnome"
+-ecore_config -c $DB -k /entrance/session/3/icon -s "gnome.png"
+-ecore_config -c $DB -k /entrance/session/4/session -s "Enlightenment"
+-ecore_config -c $DB -k /entrance/session/4/title -s "E16"
+-ecore_config -c $DB -k /entrance/session/4/icon -s "enlightenment.png"
+-ecore_config -c $DB -k /entrance/session/5/session -s "xfce"
+-ecore_config -c $DB -k /entrance/session/5/title -s "XFce"
+-ecore_config -c $DB -k /entrance/session/5/icon -s "xfce.png"
+-ecore_config -c $DB -k /entrance/session/6/session -s "failsafe"
+-ecore_config -c $DB -k /entrance/session/6/title -s "Failsafe"
+-ecore_config -c $DB -k /entrance/session/6/icon -s "failsafe.png"
++ecore_config -c $DB -k /entrance/session/1/session -s "/etc/X11/Sessions/Enlightenment"
+ ecore_config -c $DB -k /entrance/system/reboot -i 1
+ ecore_config -c $DB -k /entrance/system/halt -i 1
+ ecore_config -c $DB -k /entrance/user/remember -i 1
+@@ -50,5 +35,5 @@
+ ecore_config -c $DB -k /entrance/presel/mode -i 1
  
- # set auth to 1 for pam, 2 for shadow
--ecore_config $DB set /entrance/auth int @auth_mode@
-+ecore_config $DB set /entrance/auth int 0
- 
- # uncomment the below to enable experimental OpenGL hardware acceleration
- #ecore_config $DB set /entrance/engine int 1
-@@ -18,32 +18,17 @@
- #ecore_config $DB set /entrance/fonts/0/str str "/usr/share/fonts/truetype/"
- #ecore_config $DB set /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/"
- ecore_config $DB set /entrance/greeting/before str "Welcome to"
--ecore_config $DB set /entrance/greeting/after str ""
--ecore_config $DB set /entrance/session/count int 8
--ecore_config $DB set /entrance/session/0/session str "default"
-+ecore_config $DB set /entrance/greeting/after str " e17/OE"
-+ecore_config $DB set /entrance/session/count int 3
-+ecore_config $DB set /entrance/session/0/session str "/etc/X11/Sessions/Enlightenment"
- ecore_config $DB set /entrance/session/0/title str "Default"
- ecore_config $DB set /entrance/session/0/icon str "default.png"
- ecore_config $DB set /entrance/session/1/icon str "enlightenment.png"
- ecore_config $DB set /entrance/session/1/title str "Enlightenment"
--ecore_config $DB set /entrance/session/1/session str "Enlightenment"
--ecore_config $DB set /entrance/session/2/session str "kde"
--ecore_config $DB set /entrance/session/2/title str "KDE"
--ecore_config $DB set /entrance/session/2/icon str "kde.png"
--ecore_config $DB set /entrance/session/3/session str "gnome"
--ecore_config $DB set /entrance/session/3/title str "Gnome"
--ecore_config $DB set /entrance/session/3/icon str "gnome.png"
--ecore_config $DB set /entrance/session/4/session str "blackbox"
--ecore_config $DB set /entrance/session/4/title str "Blackbox"
--ecore_config $DB set /entrance/session/4/icon str "blackbox.png"
--ecore_config $DB set /entrance/session/5/session str "sawfish"
--ecore_config $DB set /entrance/session/5/title str "Sawfish"
--ecore_config $DB set /entrance/session/5/icon str "default.png"
--ecore_config $DB set /entrance/session/6/session str "xfce"
--ecore_config $DB set /entrance/session/6/title str "XFce"
--ecore_config $DB set /entrance/session/6/icon str "xfce.png"
--ecore_config $DB set /entrance/session/7/session str "failsafe"
--ecore_config $DB set /entrance/session/7/title str "Failsafe"
--ecore_config $DB set /entrance/session/7/icon str "failsafe.png"
-+ecore_config $DB set /entrance/session/1/session str "/etc/X11/Sessions/Enlightenment"
-+ecore_config $DB set /entrance/session/2/session str "/etc/X11/Sessions/Failsafe"
-+ecore_config $DB set /entrance/session/2/title str "Failsafe"
-+ecore_config $DB set /entrance/session/2/icon str "failsafe.png"
- ecore_config $DB set /entrance/system/reboot int 1
- ecore_config $DB set /entrance/system/halt int 1
- ecore_config $DB set /entrance/user/remember int 1
+ # for Entranced
+-ecore_config -c $DB -k /entranced/xserver -s "/usr/X11R6/bin/X -quiet -nolisten tcp"
++ecore_config -c $DB -k /entranced/xserver -s "/etc/X11/Xserver"
+ ecore_config -c $DB -k /entranced/attempts -i 5
diff --git a/packages/e17/entrance_20050926.bb b/packages/e17/entrance_20060101.bb
index 9599c9fcac..64fdac9e09 100644
--- a/packages/e17/entrance_20050926.bb
+++ b/packages/e17/entrance_20060101.bb
@@ -6,11 +6,9 @@ DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch dete
 RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-SRCDATE = "${PV}"
 PR = "r9"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \
-           file://Xserver.patch;patch=1 \
+SRC_URI = "cvs://anonymous@thinktux.net/root;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 \
@@ -26,7 +24,8 @@ INITSCRIPT_NAME = "entrance"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
-                --with-xsession=/etc/X11/Xsession"
+                --with-xsession=/etc/X11/Xsession \
+                --with-auth-mode=0"
 
 FILES += "${datadir}"
 
diff --git a/packages/e17/evidence_20050926.bb b/packages/e17/evidence_20060101.bb
index f27f8f1076..5c24152b17 100644
--- a/packages/e17/evidence_20050926.bb
+++ b/packages/e17/evidence_20060101.bb
@@ -6,9 +6,8 @@ MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 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"
-SRCDATE = "${PV}"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/evidence;module=evidence"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/evidence;module=evidence;date=${PV}"
 S = "${WORKDIR}/evidence"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
diff --git a/packages/e17/examine_20050926.bb b/packages/e17/examine_20060101.bb
index 3a78a961a4..45ceb65458 100644
--- a/packages/e17/examine_20050926.bb
+++ b/packages/e17/examine_20060101.bb
@@ -4,9 +4,8 @@ LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r0"
-SRCDATE = "${PV}"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/examine"
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/examine;date=${PV}"
 S = "${WORKDIR}/examine"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
diff --git a/packages/efl/e_0.16.999.018.bb b/packages/efl/e_0.16.999.022.bb
index 35bb776269..35bb776269 100644
--- a/packages/efl/e_0.16.999.018.bb
+++ b/packages/efl/e_0.16.999.022.bb
diff --git a/packages/efl/e_20050926.bb b/packages/efl/e_20060101.bb
index e9efc5123e..495b647101 100644
--- a/packages/efl/e_20050926.bb
+++ b/packages/efl/e_20060101.bb
@@ -1,14 +1,11 @@
 DESCRIPTION = "Enlightenment Window Mananger Library"
 DEPENDS = "virtual/evas virtual/ecore edje eet embryo"
 LICENSE = "MIT"
-SRCDATE = "${PV}"
 PR = "r1"
 
 inherit efl
 
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \
+SRC_URI = "cvs://anonymous@thinktux.net/root;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.018.bb b/packages/efl/ecore-fb_0.9.9.022.bb
index a5a843aeb4..a5a843aeb4 100644
--- a/packages/efl/ecore-fb_0.9.9.018.bb
+++ b/packages/efl/ecore-fb_0.9.9.022.bb
diff --git a/packages/efl/ecore-fb_20050907.bb b/packages/efl/ecore-fb_20060101.bb
index b60cd7e1fd..4badfa42ec 100644
--- a/packages/efl/ecore-fb_20050907.bb
+++ b/packages/efl/ecore-fb_20060101.bb
@@ -1,9 +1,7 @@
 include ecore.inc
 PR = "r1"
 
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/ecore;date=${PV}"
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/ecore;date=${PV}"
 S = "${WORKDIR}/ecore"
 
 ### add tslib support
diff --git a/packages/efl/ecore-native_0.9.9.018.bb b/packages/efl/ecore-native_0.9.9.022.bb
index 299470841c..299470841c 100644
--- a/packages/efl/ecore-native_0.9.9.018.bb
+++ b/packages/efl/ecore-native_0.9.9.022.bb
diff --git a/packages/efl/ecore-native_20060101.bb b/packages/efl/ecore-native_20060101.bb
new file mode 100644
index 0000000000..285fa99a3a
--- /dev/null
+++ b/packages/efl/ecore-native_20060101.bb
@@ -0,0 +1,33 @@
+include ecore.inc
+PR = "r1"
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/ecore;date=${PV} \
+           file://remove-tslib-configure.patch;patch=1"
+S = "${WORKDIR}/ecore"
+
+EXTRA_OECONF = "--enable-ecore-fb \
+		--enable-ecore-job \
+		--enable-ecore-file \
+		--enable-poll \
+		--enable-ecore-dbus \
+		--enable-ecore-evas \
+		--enable-ecore-evas-fb \
+		--disable-ecore-evas-x \
+		--disable-ecore-evas-gl \
+		--enable-ecore-con \
+		--enable-ecore-config \
+		--enable-ecore-ipc \
+		--enable-ecore-txt \
+		--disable-ecore-x \
+		--disable-curl \
+		--without-curl-config \
+		--enable-ecore-config \
+		--disable-openssl"
+
+parts = "Ecore Ecore_Job Ecore_File Ecore_DBus Ecore_Txt Ecore_Fb Ecore_Con Ecore_Ipc Ecore_Evas Ecore_Config"
+
+inherit native
+# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it
+# DEPENDS = "curl-native eet-native evas-native"
+DEPENDS = "eet-native evas-native"
+PROVIDES = "ecore-native"
\ No newline at end of file
diff --git a/packages/efl/ecore-x11_0.9.9.018.bb b/packages/efl/ecore-x11_0.9.9.022.bb
index 0927b59e03..0927b59e03 100644
--- a/packages/efl/ecore-x11_0.9.9.018.bb
+++ b/packages/efl/ecore-x11_0.9.9.022.bb
diff --git a/packages/efl/ecore-x11_20060101.bb b/packages/efl/ecore-x11_20060101.bb
new file mode 100644
index 0000000000..cc4fc76de7
--- /dev/null
+++ b/packages/efl/ecore-x11_20060101.bb
@@ -0,0 +1,29 @@
+include ecore.inc
+DEPENDS += "evas-x11"
+PR = "r2"
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/ecore;date=${PV} \
+           file://evas-x11-include.patch;patch=1 \
+           file://remove-tslib-configure.patch;patch=1"
+S = "${WORKDIR}/ecore"
+
+EXTRA_OECONF = "--enable-ecore-fb \
+		--enable-ecore-job \
+		--enable-ecore-file \
+		--enable-ecore-dbus \
+		--enable-ecore-evas-fb \
+		--enable-ecore-evas-x \
+		--disable-ecore-evas-gl \
+		--enable-ecore-con \
+		--enable-ecore-ipc \
+		--enable-ecore-txt \
+		--enable-ecore-x \
+		--enable-ecore-config \
+		--disable-openssl \
+		--x-includes=${STAGING_INCDIR}/X11 \
+		--x-libraries=${STAGING_LIBDIR}	"
+
+parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \
+	 Ecore_Txt Ecore_Fb Ecore_Con \
+	 Ecore_Ipc Ecore_Evas Ecore_Config \
+	 Ecore_X"
diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc
index ffc9df6b92..59d1af6cb3 100644
--- a/packages/efl/ecore.inc
+++ b/packages/efl/ecore.inc
@@ -12,7 +12,7 @@ inherit efl
 SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \
            file://configure.patch;patch=1 \
            file://fix-tslib-configure.patch;patch=1 \
-           cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/ecore/m4;date=20050926"
+           cvs://anonymous@thinktux.net/root;module=e17/libs/ecore/m4;date=20050926"
 
 S = "${WORKDIR}/ecore-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
@@ -24,9 +24,11 @@ headers = ""
 parts = "<override me>"
 
 do_configure_prepend() {
-	install -d "${S}/m4"
-	install "${WORKDIR}/m4/"*.m4 "${S}/m4"
-	aclocal -I m4
+	if [ -e "${WORKDIR}/m4" ]; then
+		install -d "${S}/m4"
+		install "${WORKDIR}/m4/"*.m4 "${S}/m4"
+		aclocal -I m4
+	fi
 }
 
 do_stage_append() {
diff --git a/packages/efl/ecore/remove-tslib-configure.patch b/packages/efl/ecore/remove-tslib-configure.patch
new file mode 100644
index 0000000000..40ed1c2c33
--- /dev/null
+++ b/packages/efl/ecore/remove-tslib-configure.patch
@@ -0,0 +1,15