merge of 8ae00e8423679ec41790b01db397b47b07473927

     and 90cfec2b058d549c4919f09e6d58e09c7dabca84

61 files changed, 491 insertions, 96 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 @@
+--- ecore/configure.in.~1.125.~	2005-11-29 01:13:26.000000000 -0800
++++ ecore/configure.in	2006-01-12 11:21:42.000000000 -0800
+@@ -101,12 +101,6 @@
+ AC_CHECK_FUNCS(gettimeofday)
+ 
+ tslib_libs=""
+-AC_CHECK_HEADER(tslib.h,
+-  [
+-    tslib_libs="-ltslib"
+-    AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_X Module])
+-  ]
+-)
+ AC_SUBST(tslib_libs)
+ 
+ AC_CHECK_HEADERS(netinet/in.h)
diff --git a/packages/efl/edb-native_20060101.bb b/packages/efl/edb-native_20060101.bb
new file mode 100644
index 0000000000..d83a3b77c6
--- /dev/null
+++ b/packages/efl/edb-native_20060101.bb
@@ -0,0 +1,9 @@
+include edb_${PV}.bb
+inherit native
+DEPENDS = "zlib-native"
+
+EXTRA_OECONF += "--disable-gtk --disable-ncurses"
+
+do_stage_append () {
+	install -m 0755 tools/.libs/edb_ed ${STAGING_BINDIR}
+}
diff --git a/packages/efl/edb_20060101.bb b/packages/efl/edb_20060101.bb
new file mode 100644
index 0000000000..0d0d899037
--- /dev/null
+++ b/packages/efl/edb_20060101.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "EDB is a database convenience library wrapped around the \
+Berkeley DB 2.7.7 by Sleepycat Software."
+DEPENDS = "zlib ncurses"
+LICENSE = "BSD"
+PR = "r1"
+
+inherit efl
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/edb;date=${PV}"
+S = "${WORKDIR}/edb"
+
+EXTRA_OECONF += "--disable-gtk"
+
+libdirectory = "src"
+
+FILES_${PN}-dev += "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed"
+RDEPENDS_${PN}-dev += "ncurses"
\ No newline at end of file
diff --git a/packages/efl/edje-native_0.5.0.018.bb b/packages/efl/edje-native_0.5.0.022.bb
index 523c38ba46..523c38ba46 100644
--- a/packages/efl/edje-native_0.5.0.018.bb
+++ b/packages/efl/edje-native_0.5.0.022.bb
diff --git a/packages/efl/edje-native_20060101.bb b/packages/efl/edje-native_20060101.bb
new file mode 100644
index 0000000000..523c38ba46
--- /dev/null
+++ b/packages/efl/edje-native_20060101.bb
@@ -0,0 +1,28 @@
+include edje_${PV}.bb
+PR = "r2"
+
+REAL_TARGET_SYS := ${TARGET_SYS}
+
+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	\
+  --with-ecore-config=${STAGING_BINDIR}/ecore-config-native	\
+  --with-eet-config=${STAGING_BINDIR}/eet-config-native		\
+  --with-embryo-config=${STAGING_BINDIR}/embryo-config-native	\
+  --with-imlib2-config=${STAGING_BINDIR}/imlib2-config-native	"
+
+do_configure_prepend() {
+        sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
+#	sed -i 's:/usr/bin/cpp:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-cpp:' ${S}/src/bin/edje_cc_parse.c
+#	sed -i 's:/usr/bin/gcc:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-gcc:' ${S}/src/bin/edje_cc_parse.c
+}
+
+do_stage_append() {
+	edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir`
+	# could also use ${STAGING_DATADIR}/edje/include
+	install -d $edje_data_dir/include
+	install -m 0644 data/include/edje.inc $edje_data_dir/include
+}
diff --git a/packages/efl/edje_0.5.0.018.bb b/packages/efl/edje_0.5.0.022.bb
index 3c3a4fdcc7..9315639af2 100644
--- a/packages/efl/edje_0.5.0.018.bb
+++ b/packages/efl/edje_0.5.0.022.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 inherit efl
 
-SRC_URI += "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/edje/m4;date=20050926"
+SRC_URI += "cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101"
 
 LEAD_SONAME = "libedje.so"
 
diff --git a/packages/efl/edje_20060101.bb b/packages/efl/edje_20060101.bb
new file mode 100644
index 0000000000..9a23201f80
--- /dev/null
+++ b/packages/efl/edje_20060101.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Edje is a complex graphical design & layout library."
+# can also install vim data files
+DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2"
+LICENSE = "MIT"
+PR = "r1"
+
+inherit efl
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/edje;date=${PV}"
+S = "${WORKDIR}/edje"
+
+LEAD_SONAME = "libedje.so"
+
+FILES_${PN}-dev += "${bindir}"
+
+RDEPENDS_${PN}-dev += "cpp"
+
diff --git a/packages/efl/eet-native_0.9.10.018.bb b/packages/efl/eet-native_0.9.10.022.bb
index fa20c9fb30..fa20c9fb30 100644
--- a/packages/efl/eet-native_0.9.10.018.bb
+++ b/packages/efl/eet-native_0.9.10.022.bb
diff --git a/packages/efl/eet-native_20060101.bb b/packages/efl/eet-native_20060101.bb
new file mode 100644
index 0000000000..fa20c9fb30
--- /dev/null
+++ b/packages/efl/eet-native_20060101.bb
@@ -0,0 +1,7 @@
+include eet_${PV}.bb
+inherit native
+DEPENDS = "zlib-native jpeg-native"
+
+do_stage_append() {
+	install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR}
+}
diff --git a/packages/efl/eet_0.9.10.018.bb b/packages/efl/eet_0.9.10.022.bb
index c0f89b1064..c0f89b1064 100644
--- a/packages/efl/eet_0.9.10.018.bb
+++ b/packages/efl/eet_0.9.10.022.bb
diff --git a/packages/efl/eet_20060101.bb b/packages/efl/eet_20060101.bb
new file mode 100644
index 0000000000..70dde944fa
--- /dev/null
+++ b/packages/efl/eet_20060101.bb
@@ -0,0 +1,12 @@
+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 = "r1"
+
+inherit efl
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/eet;date=${PV}"
+S = "${WORKDIR}/eet"
diff --git a/packages/efl/embryo-native_0.9.1.018.bb b/packages/efl/embryo-native_0.9.1.022.bb
index a33adb7bd2..a33adb7bd2 100644
--- a/packages/efl/embryo-native_0.9.1.018.bb
+++ b/packages/efl/embryo-native_0.9.1.022.bb
diff --git a/packages/efl/embryo-native_20060101.bb b/packages/efl/embryo-native_20060101.bb
new file mode 100644
index 0000000000..a33adb7bd2
--- /dev/null
+++ b/packages/efl/embryo-native_20060101.bb
@@ -0,0 +1,7 @@
+include embryo_${PV}.bb
+inherit native
+
+do_stage_append() {
+	install -d ${STAGING_DATADIR}/embryo/include
+	install -m 0644 include/default.inc ${STAGING_DATADIR}/embryo/include
+}
\ No newline at end of file
diff --git a/packages/efl/embryo_0.9.1.018.bb b/packages/efl/embryo_0.9.1.022.bb
index 1802da1bca..1802da1bca 100644
--- a/packages/efl/embryo_0.9.1.018.bb
+++ b/packages/efl/embryo_0.9.1.022.bb
diff --git a/packages/efl/embryo_20060101.bb b/packages/efl/embryo_20060101.bb
new file mode 100644
index 0000000000..58ff67869b
--- /dev/null
+++ b/packages/efl/embryo_20060101.bb
@@ -0,0 +1,12 @@
+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 = "r1"
+
+inherit efl
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/embryo;date=${PV}"
+S = "${WORKDIR}/embryo"
diff --git a/packages/efl/emotion_20060101.bb b/packages/efl/emotion_20060101.bb
new file mode 100644
index 0000000000..e450cf1d3a
--- /dev/null
+++ b/packages/efl/emotion_20060101.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Emotion is a multimedia library based on libxine"
+LICENSE = "MIT"
+DEPENDS = "eet virtual/evas edje virtual/ecore embryo virtual/libxine"
+RDEPENDS += "libemotion-themes libemotion-plugins"
+PR = "r2"
+
+#FIXME: Needs patch not to build the examples when building against ecore-fb, because the examples depend on ecore-x11
+
+inherit efl
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/emotion;date=${PV}"
+S = "${WORKDIR}/emotion"
+
+PACKAGES += "emotion-plugins"
+FILES_emotion-plugins = "${libdir}/xine/plugins/1.1.0/*.so ${libdir}/emotion/*.so"
+
+do_compile_prepend() {
+	find ${S} -type f -name "*.[ch]" | xargs sed -i 's:NULL:0:g'
+}
\ No newline at end of file
diff --git a/packages/efl/engrave_20050926.bb b/packages/efl/engrave_20060101.bb
index 8ee284fb19..e3b64a82d3 100644
--- a/packages/efl/engrave_20050926.bb
+++ b/packages/efl/engrave_20060101.bb
@@ -5,7 +5,7 @@ DEPENDS = "virtual/evas virtual/ecore"
 
 inherit efl
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/engrave"
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/engrave;date=${PV}"
 S = "${WORKDIR}/engrave"
 
 do_stage_append() {
diff --git a/packages/efl/epeg_20060101.bb b/packages/efl/epeg_20060101.bb
new file mode 100644
index 0000000000..36ababb26f
--- /dev/null
+++ b/packages/efl/epeg_20060101.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Epeg is a small library for handling thumbnails."
+LICENSE = "MIT"
+DEPENDS = "jpeg"
+
+inherit efl
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/epeg;date=${PV}"
+S = "${WORKDIR}/epeg"
diff --git a/packages/efl/esmart-fb_20060101.bb b/packages/efl/esmart-fb_20060101.bb
new file mode 100644
index 0000000000..06360528a2
--- /dev/null
+++ b/packages/efl/esmart-fb_20060101.bb
@@ -0,0 +1,21 @@
+include esmart.inc
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/esmart;date=${PV}"
+S = "${WORKDIR}/esmart"
+
+SRC_URI += "file://disable-x-only-features.patch;patch=1"
+
+myheaders = "esmart_container/Esmart_Container.h \
+             esmart_draggies/Esmart_Draggies.h \
+             esmart_file_dialog/Esmart_File_Dialog.h \
+             esmart_text_entry/Esmart_Text_Entry.h \
+             esmart_textarea/Esmart_Textarea.h \
+             esmart_thumb/Esmart_Thumb.h"
+
+mylibraries = "esmart_container \
+               esmart_draggies \
+               esmart_file_dialog \
+               esmart_text_entry \
+               esmart_textarea \
+               esmart_thumb"
diff --git a/packages/efl/esmart-x11_20060101.bb b/packages/efl/esmart-x11_20060101.bb
new file mode 100644
index 0000000000..88684e6851
--- /dev/null
+++ b/packages/efl/esmart-x11_20060101.bb
@@ -0,0 +1,27 @@
+include esmart.inc
+PR = "r2"
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/esmart;date=${PV}"
+SRC_URI += "file://ecore-fix.patch;patch=1 \
+            file://include-stdio.patch;patch=1"
+S = "${WORKDIR}/esmart"
+
+myheaders = "esmart_container/Esmart_Container.h \
+             esmart_draggies/Esmart_Draggies.h \
+             esmart_file_dialog/Esmart_File_Dialog.h \
+             esmart_text_entry/Esmart_Text_Entry.h \
+             esmart_textarea/Esmart_Textarea.h \
+             esmart_thumb/Esmart_Thumb.h \
+             esmart_trans_x11/Esmart_Trans_X11.h"
+
+mylibraries = "esmart_container \
+               esmart_draggies \
+               esmart_file_dialog \
+               esmart_text_entry \
+               esmart_textarea \
+               esmart_thumb \
+               esmart_trans_x11"
+
+do_compile_prepend() {
+	find ${S} -type f -name "*.[ch]" | xargs sed -i 's:NULL:0:g'
+}
\ No newline at end of file
diff --git a/packages/efl/etox_20060101.bb b/packages/efl/etox_20060101.bb
new file mode 100644
index 0000000000..d460479c4f
--- /dev/null
+++ b/packages/efl/etox_20060101.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Etox is a type setting and text layout library based on Evas. \
+Etox helps you when it comes to displaying, moving, resizing, layering, \
+clipping, aligning and coloring fonts in different styles, and more."
+DEPENDS = "edb virtual/evas virtual/ecore"
+LICENSE = "MIT"
+PR = "r1"
+
+inherit efl
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/etox;date=${PV}"
+S = "${WORKDIR}/etox"
+
+libdirectory = "src"
diff --git a/packages/efl/evas-fb_0.9.9.019.bb b/packages/efl/evas-fb_0.9.9.022.bb
index b0c9d5bdb6..b0c9d5bdb6 100644
--- a/packages/efl/evas-fb_0.9.9.019.bb
+++ b/packages/efl/evas-fb_0.9.9.022.bb
diff --git a/packages/efl/evas-fb_20050907.bb b/packages/efl/evas-fb_20060101.bb
index de783a7aeb..525aad5edf 100644
--- a/packages/efl/evas-fb_20050907.bb
+++ b/packages/efl/evas-fb_20060101.bb
@@ -4,7 +4,7 @@ PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/evas;date=${PV} \
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/evas;date=${PV} \
            file://pkg.m4"
 S = "${WORKDIR}/evas"
 
diff --git a/packages/efl/evas-native_0.9.9.019.bb b/packages/efl/evas-native_0.9.9.022.bb
index 60bf7f6ae5..60bf7f6ae5 100644
--- a/packages/efl/evas-native_0.9.9.019.bb
+++ b/packages/efl/evas-native_0.9.9.022.bb
diff --git a/packages/efl/evas-native_20060101.bb b/packages/efl/evas-native_20060101.bb
new file mode 100644
index 0000000000..6482571932
--- /dev/null
+++ b/packages/efl/evas-native_20060101.bb
@@ -0,0 +1,4 @@
+include evas-fb_${PV}.bb
+inherit native
+DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
+PROVIDES = "evas-native"
diff --git a/packages/efl/evas-x11_0.9.9.019.bb b/packages/efl/evas-x11_0.9.9.022.bb
index 75a080a26c..75a080a26c 100644
--- a/packages/efl/evas-x11_0.9.9.019.bb
+++ b/packages/efl/evas-x11_0.9.9.022.bb
diff --git a/packages/efl/evas-x11_20060101.bb b/packages/efl/evas-x11_20060101.bb
new file mode 100644
index 0000000000..d32565dd3b
--- /dev/null
+++ b/packages/efl/evas-x11_20060101.bb
@@ -0,0 +1,55 @@
+include evas.inc
+DEPENDS += "x11 xext freetype"
+PR = "r3"
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/evas;date=${PV}"
+S = "${WORKDIR}/evas"
+
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
+		--x-libraries=${STAGING_LIBDIR} \
+		--enable-fb			\
+		--disable-directfb		\
+		--disable-buffer		\
+		--disable-software-qtopia	\
+		--enable-software-x11		\
+		--disable-gl-x11		\
+		--enable-image-loader-eet	\
+		--enable-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_Software_X11.h \
+           Evas_Engine_XRender_X11.h \
+           Evas_Engine_Buffer.h \
+           Evas_Engine_FB.h \
+           Evas.h"
+
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 14d5cd3e32..3f25fd5767 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -13,17 +13,20 @@ export FREETYPE_CONFIG		= "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
            file://fix-configure.patch;patch=1 \
-           cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/evas/m4;date=20050926"
+           cvs://anonymous@thinktux.net/root;module=e17/libs/evas/m4;date=20050926"
 
 S = "${WORKDIR}/evas-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 
 EXTRA_OECONF = "<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_configure () {
@@ -32,6 +35,7 @@ do_configure () {
 	#find ${S} -name Makefile | xargs sed -i 's:--tag=CC:-lfreetype --tag=CC:'
 }
 
+
 headers = "<override me>"
 libraries = "libevas"
 
diff --git a/packages/efl/imlib2-fb_1.2.1.006.bb b/packages/efl/imlib2-fb_1.2.1.009.bb
index 09fecdaf8b..09fecdaf8b 100644
--- a/packages/efl/imlib2-fb_1.2.1.006.bb
+++ b/packages/efl/imlib2-fb_1.2.1.009.bb
diff --git a/packages/efl/imlib2-fb_20060101.bb b/packages/efl/imlib2-fb_20060101.bb
new file mode 100644
index 0000000000..88f988e8a0
--- /dev/null
+++ b/packages/efl/imlib2-fb_20060101.bb
@@ -0,0 +1,8 @@
+include imlib2.inc
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/imlib2;date=${PV}"
+S = "${WORKDIR}/imlib2"
+
+EXTRA_OECONF = "--without-x \
+		--disable-mmx"
+
diff --git a/packages/efl/imlib2-native_1.2.1.006.bb b/packages/efl/imlib2-native_1.2.1.009.bb
index 6f8ebe477a..6f8ebe477a 100644
--- a/packages/efl/imlib2-native_1.2.1.006.bb
+++ b/packages/efl/imlib2-native_1.2.1.009.bb
diff --git a/packages/efl/imlib2-native_20060101.bb b/packages/efl/imlib2-native_20060101.bb
new file mode 100644
index 0000000000..11c2fa4b89
--- /dev/null
+++ b/packages/efl/imlib2-native_20060101.bb
@@ -0,0 +1,11 @@
+include imlib2.inc
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/imlib2;date=${PV}"
+S = "${WORKDIR}/imlib2"
+
+inherit native
+PROVIDES = "imlib2-native"
+DEPENDS = "freetype-native libpng-native jpeg-native"
+
+EXTRA_OECONF = "--disable-mmx \
+                --without-x"
diff --git a/packages/efl/imlib2-x11_1.2.1.006.bb b/packages/efl/imlib2-x11_1.2.1.009.bb
index 165321355c..165321355c 100644
--- a/packages/efl/imlib2-x11_1.2.1.006.bb
+++ b/packages/efl/imlib2-x11_1.2.1.009.bb
diff --git a/packages/efl/imlib2-x11_20060101.bb b/packages/efl/imlib2-x11_20060101.bb
new file mode 100644
index 0000000000..1fab5cb292
--- /dev/null
+++ b/packages/efl/imlib2-x11_20060101.bb
@@ -0,0 +1,11 @@
+include imlib2.inc
+
+SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/imlib2;date=${PV}"
+S = "${WORKDIR}/imlib2"
+
+DEPENDS += "x11 xext"
+
+EXTRA_OECONF = "--disable-mmx \
+                --with-x \
+                --x-includes=${STAGING_INCDIR} \
+                --x-libraries=${STAGING_LIBDIR}"
diff --git a/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch b/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
new file mode 100644
index 0000000000..c195aad639
--- /dev/null
+++ b/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
@@ -0,0 +1,16 @@
+--- trunk/backends/xml-backend.c~	2006-01-18 09:57:39.000000000 -0800
++++ trunk/backends/xml-backend.c	2006-01-19 11:38:37.000000000 -0800
+@@ -115,6 +115,13 @@
+ 
+ typedef struct _XMLSource XMLSource;
+ 
++extern GConfLock*
++gconf_get_lock (const gchar *lock_directory,
++                GError     **err);
++extern gboolean
++gconf_release_lock (GConfLock *lock,
++                    GError   **err);
++
+ /* XMLSource **/
+ 
+ struct _XMLSource {
diff --git a/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch b/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
new file mode 100644
index 0000000000..312a356c84
--- /dev/null
+++ b/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
@@ -0,0 +1,11 @@
+--- trunk/backends/Makefile~	2006-01-19 09:52:22.000000000 -0800
++++ trunk/backends/Makefile	2006-01-19 13:13:23.000000000 -0800
+@@ -84,7 +84,7 @@
+ xml_test_OBJECTS = $(am_xml_test_OBJECTS)
+ xml_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
+-	$(top_builddir)/backends/libgconfbackend-oldxml.la
++	libgconfbackend-oldxml.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index dcd5209989..d6b79494be 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -12,6 +12,8 @@ PR = "r0"
 
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
            file://gconf-dbus-update.patch;patch=1;pnum=0 \
+           file://xml-backend-locks-compile-fix.patch;patch=1 \
+           file://xml-backend-oldxml-Makefile.patch \
 	   file://69gconfd-dbus"
 
 inherit pkgconfig autotools
@@ -25,6 +27,11 @@ EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SY
 
 HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
 
+do_compile_prepend() {
+	cd ${S}
+	patch -p1 < ../xml-backend-oldxml-Makefile.patch
+}
+
 do_stage() {
         oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
         install -d ${STAGING_INCDIR}/gconf/2/gconf/
diff --git a/packages/gtk-webcore/files/setHandle_segfault-fix.patch b/packages/gtk-webcore/files/setHandle_segfault-fix.patch
new file mode 100644
index 0000000000..9ebdfeebe5
--- /dev/null
+++ b/packages/gtk-webcore/files/setHandle_segfault-fix.patch
@@ -0,0 +1,16 @@
+--- NRCore/kwiq/KWQResourceLoader.cpp.orig	2006-01-21 00:13:32.000000000 +0200
++++ NRCore/kwiq/KWQResourceLoader.cpp	2006-01-20 23:52:59.000000000 +0200
+@@ -56,8 +56,11 @@
+ void KWQResourceLoader::setHandle(WebCoreResourceHandle* handle)
+ {
+     ASSERT(!_handle);
+-    handle->retain();
+-    _handle = handle;
++    if (handle)
++	{
++    	 handle->retain();
++    	 _handle = handle;
++	}
+ }
+ 
+ void KWQResourceLoader::receivedResponse(KWIQResponse* response)
diff --git a/packages/gtk-webcore/osb-nrcore_20050430.bb b/packages/gtk-webcore/osb-nrcore_20050430.bb
index 758058d355..2f5f2f6046 100644
--- a/packages/gtk-webcore/osb-nrcore_20050430.bb
+++ b/packages/gtk-webcore/osb-nrcore_20050430.bb
@@ -7,10 +7,13 @@ SECTION = "gpe"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDSRCDATE}"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gtk+ pango osb-jscore"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE}"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \
+	   file://KWIQ-mimetype-segfault.patch;patch=1 \
+	   file://setHandle_segfault-fix.patch;patch=1"
 S = "${WORKDIR}/NRCore"
 
 LEAD_SONAME = "libnrcore.so"
diff --git a/packages/synergy/synergy_1.2.4.bb b/packages/synergy/synergy_1.2.7.bb
index 0bd27f5e06..0bd27f5e06 100644
--- a/packages/synergy/synergy_1.2.4.bb
+++ b/packages/synergy/synergy_1.2.7.bb