32 files changed, 71 insertions, 70 deletions
diff --git a/packages/efl1/ecore-native_cvs.bb b/packages/efl1/ecore-native_svn.bb
index f21ba5075a..f84c6581d0 100644
--- a/packages/efl1/ecore-native_cvs.bb
+++ b/packages/efl1/ecore-native_svn.bb
@@ -1,7 +1,7 @@
 require ecore.inc
 inherit native
 DEPENDS = "eet-native evas-native"
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "\
                 --enable-ecore-txt \
diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index a0d040888d..aa3962eda8 100644
--- a/packages/efl1/ecore.inc
+++ b/packages/efl1/ecore.inc
@@ -1,9 +1,9 @@
 DESCRIPTION = "Ecore is the Enlightenment application framework library"
 LICENSE = "MIT BSD"
-DEPENDS = "curl eet evas tslib libxtst libxscrnsaver"
+DEPENDS = "curl eet evas tslib libxtst libxscrnsaver libxdamage libxrandr libxcursor"
 # optional
 # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
-PV = "0.9.9.043+cvs${SRCDATE}"
+PV = "0.9.9.043+svnr${SRCREV}"
 
 inherit efl
 
diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_svn.bb
index f36cc737bf..6e581cda5d 100644
--- a/packages/efl1/ecore_cvs.bb
+++ b/packages/efl1/ecore_svn.bb
@@ -1,5 +1,5 @@
 require ecore.inc
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "\
   --x-includes=${STAGING_INCDIR}/X11 \
diff --git a/packages/efl1/edb_cvs.bb b/packages/efl1/edb_cvs.bb
deleted file mode 100644
index 9158590b03..0000000000
--- a/packages/efl1/edb_cvs.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "Edb is the Enlightenment database library"
-LICENSE = "MIT BSD"
-DEPENDS = "zlib"
-PV = "1.0.5.043+cvs${SRCDATE}"
-PR = "r0"
-
-inherit efl
diff --git a/packages/efl1/edb_svn.bb b/packages/efl1/edb_svn.bb
new file mode 100644
index 0000000000..3c4cc9d0c2
--- /dev/null
+++ b/packages/efl1/edb_svn.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Edb is the Enlightenment database library"
+LICENSE = "MIT BSD"
+DEPENDS = "zlib"
+PV = "1.0.5.043+svnr${SRCREV}"
+PR = "r1"
+
+inherit efl
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD;module=edb;proto=http"
diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_svn.bb
index 8574d9f29e..d200054a39 100644
--- a/packages/efl1/edbus_cvs.bb
+++ b/packages/efl1/edbus_svn.bb
@@ -1,15 +1,12 @@
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
 DEPENDS = "dbus ecore"
 LICENSE = "MIT BSD"
-PV = "0.5.0.043+cvs${SRCDATE}"
-PR = "r1"
+PV = "0.5.0.043+svnr${SRCREV}"
+PR = "r2"
 
 inherit efl
 
-SRC_URI = "\
-  ${E_CVS};module=e17/libs/e_dbus \
-  http://people.openmoko.org/stefan/e_nm-big-hack.patch;patch=1;pnum=1;mindate=20080330;maxdate=20080501 \
-"
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=e_dbus;proto=http"
 S = "${WORKDIR}/e_dbus"
 
 EXTRA_OECONF = "--enable-build-test-gui"
diff --git a/packages/efl1/edje-native_cvs.bb b/packages/efl1/edje-native_svn.bb
index 519476be72..238bfd00dc 100644
--- a/packages/efl1/edje-native_cvs.bb
+++ b/packages/efl1/edje-native_svn.bb
@@ -1,6 +1,6 @@
 require edje_${PV}.bb
 inherit native
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "evas-native ecore-native eet-native embryo-native"
 
diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_svn.bb
index 757b643e75..11da120bd2 100644
--- a/packages/efl1/edje_cvs.bb
+++ b/packages/efl1/edje_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
 DEPENDS = "eet evas ecore embryo edje-native"
 LICENSE = "MIT BSD"
-PV = "0.9.9.043+cvs${SRCDATE}"
-PR = "r0"
+PV = "0.5.0.043+svnr${SRCREV}"
+PR = "r1"
 
 inherit efl
 
diff --git a/packages/efl1/eet-native_cvs.bb b/packages/efl1/eet-native_svn.bb
index 096fd02524..0b0b5a4862 100644
--- a/packages/efl1/eet-native_cvs.bb
+++ b/packages/efl1/eet-native_svn.bb
@@ -1,4 +1,4 @@
-require eet_cvs.bb
+require eet_svn.bb
 inherit native
 DEPENDS = "zlib-native jpeg-native"
 # we no longer inherit pkgconfig, so we need to state this explicitly
diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_svn.bb
index 9ed58e100a..2fa24cc0bd 100644
--- a/packages/efl1/eet_cvs.bb
+++ b/packages/efl1/eet_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "EET is the Enlightenment data storage library"
 DEPENDS = "zlib jpeg"
 LICENSE = "MIT BSD"
-PV = "1.0.1+cvs${SRCDATE}"
-PR = "r0"
+PV = "1.0.1+svnr${SRCREV}"
+PR = "r1"
 
 inherit efl
diff --git a/packages/efl1/eflpp_cvs.bb b/packages/efl1/eflpp_svn.bb
index 19db2ef41e..ff12d72001 100644
--- a/packages/efl1/eflpp_cvs.bb
+++ b/packages/efl1/eflpp_svn.bb
@@ -3,10 +3,11 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 HOMEPAGE = "http://www.vanille-media.de/site/index.php/projects/efl/"
 LICENSE = "LGPL"
 DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0"
-PV = "0.1.0+cvs${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 
 inherit efl
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
-SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME}"
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS;module=cxx;proto=http"
+S = "${WORKDIR}/cxx"
diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_svn.bb
index 36a3bdf3cf..a802912730 100644
--- a/packages/efl1/efreet_cvs.bb
+++ b/packages/efl1/efreet_svn.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "The Enlightenment freedesktop.org library"
 DEPENDS = "ecore"
 LICENSE = "MIT BSD"
-PV = "0.5.0.043+cvs${SRCDATE}"
-PR = "r0"
+PV = "0.5.0.043+svnr${SRCREV}"
+PR = "r1"
 
 inherit efl
 
-PACKAGES =+ "${PN}-mime"
+PACKAGES =+ "${PN}-mime ${PN}-trash"
 FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*"
-
+FILES_${PN}-trash = "${libdir}/libefreet_trash.so.*"
diff --git a/packages/efl1/embryo-native_cvs.bb b/packages/efl1/embryo-native_svn.bb
index 2fc3faddfd..2fc3faddfd 100644
--- a/packages/efl1/embryo-native_cvs.bb
+++ b/packages/efl1/embryo-native_svn.bb
diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_svn.bb
index 02385e9ec7..42cb2f53a9 100644
--- a/packages/efl1/embryo_cvs.bb
+++ b/packages/efl1/embryo_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
 LICENSE = "MIT BSD"
-PV = "0.9.9.043+cvs${SRCDATE}"
-PR = "r0"
+PV = "0.9.9.043+svnr${SRCREV}"
+PR = "r1"
 
 inherit efl
 
diff --git a/packages/efl1/emotion_cvs.bb b/packages/efl1/emotion_svn.bb
index 960d10ad31..e30239fc5d 100644
--- a/packages/efl1/emotion_cvs.bb
+++ b/packages/efl1/emotion_svn.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "The Enlightenment multimedia library"
 LICENSE = "MIT BSD"
 # we no longer build the libxine backend, since the gstreamer backend seems more promising
-DEPENDS = "libxcursor libxinerama eet evas ecore edje gstreamer gst-plugins-base"
-PV = "0.1.0+cvs${SRCDATE}"
-PR = "r1"
+DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r2"
 
 inherit efl
 
diff --git a/packages/efl1/engrave_cvs.bb b/packages/efl1/engrave_svn.bb
index ec39189410..cc90f5a48e 100644
--- a/packages/efl1/engrave_cvs.bb
+++ b/packages/efl1/engrave_svn.bb
@@ -2,6 +2,6 @@ DESCRIPTION = "Engrave is an Edje Editing Library"
 LICENSE = "MIT"
 # also requires yacc and lex on host
 DEPENDS = "evas ecore"
-PV = "0.0.0+cvs${SRCDATE}"
+PV = "0.0.0+svnr${SRCREV}"
 
 inherit efl
diff --git a/packages/efl1/enhance_cvs.bb b/packages/efl1/enhance_svn.bb
index 8c73fbe1d8..6bec1176d1 100644
--- a/packages/efl1/enhance_cvs.bb
+++ b/packages/efl1/enhance_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Enhance translates between glade .xml files and ETK"
 LICENSE = "MIT"
 DEPENDS = "exml"
-PV = "0.0.0+cvs${SRCDATE}"
+PV = "0.0.0+svnr${SRCREV}"
 
 inherit efl
diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_svn.bb
index e48c36606e..eb4b91a8c2 100644
--- a/packages/efl1/epdf_cvs.bb
+++ b/packages/efl1/epdf_svn.bb
@@ -1,12 +1,13 @@
 DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
 LICENSE = "MIT BSD"
 DEPENDS = "poppler evas ecore etk ewl"
-PV = "0.1.0+cvs${SRCDATE}"
-PR = "r0"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r1"
 
 inherit efl
 
-SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=epdf;proto=http \
            file://fix-plugin-path-check.patch;HACK=1;patch=1"
 
 # add ewl additions
diff --git a/packages/efl1/epeg_cvs.bb b/packages/efl1/epeg_cvs.bb
deleted file mode 100644
index 16d1c333a9..0000000000
--- a/packages/efl1/epeg_cvs.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "Epeg is a small library for handling thumbnails."
-LICENSE = "MIT"
-DEPENDS = "jpeg"
-PV = "0.9.0+cvs${SRCDATE}"
-PR = "r0"
-
-inherit efl
diff --git a/packages/efl1/epeg_svn.bb b/packages/efl1/epeg_svn.bb
new file mode 100644
index 0000000000..61213fe599
--- /dev/null
+++ b/packages/efl1/epeg_svn.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Epeg is a small library for handling thumbnails."
+LICENSE = "MIT"
+DEPENDS = "jpeg"
+PV = "0.9.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit efl
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD;module=epeg;proto=http"
diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_svn.bb
index b8b3033b99..055901b19d 100644
--- a/packages/efl1/epsilon_cvs.bb
+++ b/packages/efl1/epsilon_svn.bb
@@ -3,8 +3,8 @@ that is compliant with the freedesktop.org Thumbnail Managing Standard."
 LICENSE = "MIT BSD"
 # can also depend on xine for movie thumbnails
 DEPENDS = "libpng evas ecore edje perl-native"
-PV = "0.3.0.012+cvs${SRCDATE}"
-PR = "r0"
+PV = "0.3.0.012+svnr${SRCREV}"
+PR = "r1"
 
 inherit efl
 
diff --git a/packages/efl1/esmart_cvs.bb b/packages/efl1/esmart_svn.bb
index 5a363655c3..bb88310a5e 100644
--- a/packages/efl1/esmart_cvs.bb
+++ b/packages/efl1/esmart_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "ESmart is a collection of smart Evas objects"
 LICENSE = "MIT BSD"
 DEPENDS = "evas ecore edje imlib2 epsilon libtool"
-PV = "0.9.0.043+cvs${SRCDATE}"
-PR = "r0"
+PV = "0.9.0.043+svnr${SRCREV}"
+PR = "r1"
 
 inherit efl
 
diff --git a/packages/efl1/etk-native_cvs.bb b/packages/efl1/etk-native_svn.bb
index eedb832141..345802d25d 100644
--- a/packages/efl1/etk-native_cvs.bb
+++ b/packages/efl1/etk-native_svn.bb
@@ -1,4 +1,4 @@
-require etk_cvs.bb
+require etk_svn.bb
 inherit native
 DEPENDS = "evas-native ecore-native edje-native"
 
diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_svn.bb
index 1f374e4f52..cf7520d6f0 100644
--- a/packages/efl1/etk_cvs.bb
+++ b/packages/efl1/etk_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries."
 DEPENDS = "evas ecore edje"
 LICENSE = "MIT"
-PV = "0.1.0.042+cvs${SRCDATE}"
-PR = "r1"
+PV = "0.1.0.042+svnr${SRCREV}"
+PR = "r2"
 
 inherit efl
 
diff --git a/packages/efl1/evas-native_cvs.bb b/packages/efl1/evas-native_svn.bb
index b2a235262d..3ca8df9e41 100644
--- a/packages/efl1/evas-native_cvs.bb
+++ b/packages/efl1/evas-native_svn.bb
@@ -1,7 +1,7 @@
 require evas.inc
 inherit native
 DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index 10dd8ad529..243dc55439 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -1,8 +1,8 @@
 DESCRIPTION = "Evas is the Enlightenment canvas API"
 LICENSE = "MIT BSD"
 # can also depend on valgrind, libsdl-x11, directfb
-DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender"
-PV = "0.9.9.043+cvs${SRCDATE}"
+DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender fontconfig"
+PV = "0.9.9.043+svnr${SRCREV}"
 
 inherit efl
 
@@ -21,7 +21,7 @@ python populate_packages_prepend () {
 }
 
 do_install_append() {
-    find "${D}" -name .debug -type d | xargs -iBLAH rm -rf "BLAH"
+    find "${D}" -name .debug -type d -exec rm -rf {} \;
 }
 
 FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_svn.bb
index ebe604ec2b..e7079615de 100644
--- a/packages/efl1/evas_cvs.bb
+++ b/packages/efl1/evas_svn.bb
@@ -1,5 +1,5 @@
 require evas.inc
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
diff --git a/packages/efl1/evolve-native_cvs.bb b/packages/efl1/evolve-native_svn.bb
index 8478b6b0d8..5d57075498 100644
--- a/packages/efl1/evolve-native_cvs.bb
+++ b/packages/efl1/evolve-native_svn.bb
@@ -1,4 +1,4 @@
-require evolve_cvs.bb
+require evolve_svn.bb
 inherit native
 DEPENDS = "etk-native"
 
diff --git a/packages/efl1/evolve_cvs.bb b/packages/efl1/evolve_svn.bb
index 3a0cf28d4a..fad6671675 100644
--- a/packages/efl1/evolve_cvs.bb
+++ b/packages/efl1/evolve_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Evolve allows you to write ETK designs using a C-like language"
 LICENSE = "MIT"
 DEPENDS = "etk evolve-native"
-PV = "0.0.0+cvs${SRCDATE}"
-PR = "r0"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r1"
 
 inherit efl
diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_svn.bb
index eb00215891..af490dda46 100644
--- a/packages/efl1/ewl_cvs.bb
+++ b/packages/efl1/ewl_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "The Enlightened Widget Library"
 DEPENDS = "evas ecore edje emotion efreet epsilon"
 LICENSE = "MIT BSD"
-PV = "0.5.2.042+cvs${SRCDATE}"
-PR = "r0"
+PV = "0.5.2.042+svnr${SRCREV}"
+PR = "r1"
 
 inherit efl
 
diff --git a/packages/efl1/exml_cvs.bb b/packages/efl1/exml_svn.bb
index 5a017569b7..aaf37c7ca6 100644
--- a/packages/efl1/exml_cvs.bb
+++ b/packages/efl1/exml_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Exml is a generic XML parser wrapper."
 LICENSE = "MIT"
 DEPENDS = "libxml2 libxslt ecore"
-PV = "0.1.1+cvs${SRCDATE}"
-PR = "r0"
+PV = "0.1.1+svnr${SRCREV}"
+PR = "r1"
 
 inherit efl
 
diff --git a/packages/efl1/imlib2_cvs.bb b/packages/efl1/imlib2_svn.bb
index 6fd9b4ce36..39932d74fe 100644
--- a/packages/efl1/imlib2_cvs.bb
+++ b/packages/efl1/imlib2_svn.bb
@@ -3,14 +3,12 @@ LICENSE = "BSD"
 # can also depend on tiff34, ungif or gif, z, bz2, id3tag
 DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
 PROVIDES = "virtual/imlib2"
-PV = "1.4.1.000+cvs${SRCDATE}"
-PR = "r2"
+PV = "1.4.1.001+svnr${SRCREV}"
+PR = "r3"
 
 inherit efl
 
-# The original patch was out of date in 20080420
-SRC_URI += "file://remove-local-includes.patch;patch=1;maxdate=20080420 \
-            file://remove-local-includes-20080421.patch;patch=1;mindate=20080420 "
+SRC_URI += "file://remove-local-includes-20080421.patch;patch=1;mindate=20080420 "
 
 EXTRA_OECONF = "--with-x"