aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/efl1
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-01-28 09:58:11 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2011-01-29 18:56:31 +0100
commite9db428726e47c09da468c54b4b6a414e5927b01 (patch)
tree178fdd8420ed8edf24417eaa0202e735dcd800cb /recipes/efl1
parent8b17aa1c0bb1cbcb25bd178e790b78fe37a306e9 (diff)
downloadopenembedded-e9db428726e47c09da468c54b4b6a414e5927b01.tar.gz
e-base: prepare for releases
* bump EFL_SRCREV a bit to current HEAD * introduce EFL_SRCREV_1.0.0 for recipes which don't need SRCREV change so often like stuff from OLD and BROKEN dirs and themes * move SRC_URI and S settings from bbclass to svn recipes * replace E_CVS and E_URI with E_SVN and E_MIRROR * PV/PR will be updated in following patches for individual recipes Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/efl1')
-rw-r--r--recipes/efl1/azy_svn.bb4
-rw-r--r--recipes/efl1/ecore/exit_uclibc.patch25
-rw-r--r--recipes/efl1/ecore/exit_uclibc_dns.patch13
-rw-r--r--recipes/efl1/ecore/exit_uclibc_newer.patch12
-rw-r--r--recipes/efl1/ecore/iconv.patch96
-rw-r--r--recipes/efl1/ecore_svn.bb10
-rw-r--r--recipes/efl1/edb_svn.bb5
-rw-r--r--recipes/efl1/edbus_svn.bb2
-rw-r--r--recipes/efl1/edje_svn.bb3
-rw-r--r--recipes/efl1/eet_svn.bb2
-rw-r--r--recipes/efl1/eeze_svn.bb3
-rw-r--r--recipes/efl1/eflpp_svn.bb6
-rw-r--r--recipes/efl1/efreet_svn.bb2
-rw-r--r--recipes/efl1/eina_svn.bb2
-rw-r--r--recipes/efl1/elementary-theme-efenniht_svn.bb9
-rw-r--r--recipes/efl1/elementary_svn.bb5
-rw-r--r--recipes/efl1/embryo_svn.bb2
-rw-r--r--recipes/efl1/emotion_svn.bb5
-rw-r--r--recipes/efl1/engrave_svn.bb6
-rw-r--r--recipes/efl1/enhance_svn.bb6
-rw-r--r--recipes/efl1/epdf_svn.bb4
-rw-r--r--recipes/efl1/epeg_svn.bb6
-rw-r--r--recipes/efl1/esmart_svn.bb6
-rw-r--r--recipes/efl1/ethumb_svn.bb2
-rw-r--r--recipes/efl1/evas_svn.bb5
-rw-r--r--recipes/efl1/ewl_svn.bb6
-rw-r--r--recipes/efl1/exml_svn.bb6
-rw-r--r--recipes/efl1/imlib2_svn.bb2
-rw-r--r--recipes/efl1/libeflvala_svn.bb3
-rw-r--r--recipes/efl1/libeweather_svn.bb5
30 files changed, 85 insertions, 178 deletions
diff --git a/recipes/efl1/azy_svn.bb b/recipes/efl1/azy_svn.bb
index 7e96c6051f..c7ee1f4c96 100644
--- a/recipes/efl1/azy_svn.bb
+++ b/recipes/efl1/azy_svn.bb
@@ -24,4 +24,6 @@ do_install_append_virtclass-native() {
inherit efl
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=azy;proto=http;scmdata=keep"
+SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
+
diff --git a/recipes/efl1/ecore/exit_uclibc.patch b/recipes/efl1/ecore/exit_uclibc.patch
index 105aeedcb1..3d04453eb8 100644
--- a/recipes/efl1/ecore/exit_uclibc.patch
+++ b/recipes/efl1/ecore/exit_uclibc.patch
@@ -1,13 +1,12 @@
-Index: ecore/src/lib/ecore_con/ecore_con_info.c
-===================================================================
---- ecore.orig/src/lib/ecore_con/ecore_con_info.c 2009-11-14 00:14:56.056955719 +0100
-+++ ecore/src/lib/ecore_con/ecore_con_info.c 2009-11-14 00:16:40.035696191 +0100
-@@ -243,7 +243,7 @@
- freeaddrinfo(result);
- err = write(fd[1], "", 1);
- close(fd[1]);
--# ifdef __USE_ISOC99
-+# if defined(__USE_ISOC99) && !defined(__UCLIBC__)
- _Exit(0);
- # else
- _exit(0);
+diff -uNr ecore.orig//src/lib/ecore_con/ecore_con_info.c ecore/src/lib/ecore_con/ecore_con_info.c
+--- ecore.orig//src/lib/ecore_con/ecore_con_info.c 2010-08-13 14:31:18.000000000 +0200
++++ ecore/src/lib/ecore_con/ecore_con_info.c 2010-08-13 14:49:37.000000000 +0200
+@@ -283,7 +283,7 @@
+
+ err = write(fd[1], "", 1);
+ close(fd[1]);
+-#ifdef __USE_ISOC99
++#if defined(__USE_ISOC99) && !defined(__UCLIBC__)
+ _Exit(0);
+ #else
+ _exit(0);
diff --git a/recipes/efl1/ecore/exit_uclibc_dns.patch b/recipes/efl1/ecore/exit_uclibc_dns.patch
deleted file mode 100644
index 0be2d3d6c0..0000000000
--- a/recipes/efl1/ecore/exit_uclibc_dns.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ecore/src/lib/ecore_con/ecore_con_dns.c
-===================================================================
---- ecore.orig/src/lib/ecore_con/ecore_con_dns.c 2009-11-14 00:12:04.279051754 +0100
-+++ ecore/src/lib/ecore_con/ecore_con_dns.c 2009-11-14 00:14:41.685708230 +0100
-@@ -135,7 +135,7 @@
- write(fd[1], "", 1);
- }
- close(fd[1]);
--# ifdef __USE_ISOC99
-+# if defined(__USE_ISOC99) && !defined(__UCLIBC__)
- _Exit(0);
- # else
- _exit(0);
diff --git a/recipes/efl1/ecore/exit_uclibc_newer.patch b/recipes/efl1/ecore/exit_uclibc_newer.patch
deleted file mode 100644
index 3d04453eb8..0000000000
--- a/recipes/efl1/ecore/exit_uclibc_newer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr ecore.orig//src/lib/ecore_con/ecore_con_info.c ecore/src/lib/ecore_con/ecore_con_info.c
---- ecore.orig//src/lib/ecore_con/ecore_con_info.c 2010-08-13 14:31:18.000000000 +0200
-+++ ecore/src/lib/ecore_con/ecore_con_info.c 2010-08-13 14:49:37.000000000 +0200
-@@ -283,7 +283,7 @@
-
- err = write(fd[1], "", 1);
- close(fd[1]);
--#ifdef __USE_ISOC99
-+#if defined(__USE_ISOC99) && !defined(__UCLIBC__)
- _Exit(0);
- #else
- _exit(0);
diff --git a/recipes/efl1/ecore/iconv.patch b/recipes/efl1/ecore/iconv.patch
deleted file mode 100644
index 16524917b2..0000000000
--- a/recipes/efl1/ecore/iconv.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Index: ecore/configure.ac
-===================================================================
---- ecore.orig/configure.ac 2009-11-13 13:16:18.000000000 +0100
-+++ ecore/configure.ac 2009-11-19 01:09:28.469345164 +0100
-@@ -29,6 +29,9 @@
- AM_GNU_GETTEXT_VERSION([0.12.1])
- AM_GNU_GETTEXT([external])
-
-+# explicit call AM_ICONV, because gettext is used in a different way
-+AM_ICONV
-+
- release="ver-pre-svn-04"
- case "$host_os" in
- mingw32ce* | cegcc*)
-@@ -378,48 +381,6 @@
- requirements_ecore="glib-2.0 ${requirements_ecore}"
- fi
-
--
--# iconv library (ecore_txt)
--
--iconv_cflags=""
--iconv_libs=""
--have_iconv="no"
--AC_ARG_WITH([iconv-link],
-- AC_HELP_STRING([--with-iconv-link=ICONV_LINK], [explicitly specify an iconv link option]),
-- [
-- iconv_libs=$withval
-- have_iconv="yes"
-- ]
--)
--
--if test "x${have_iconv}" = "xno" ; then
-- AC_CHECK_LIB(c, iconv,
-- [have_iconv="yes"] )
--
-- if ! test "x${have_iconv}" = "xyes" ; then
-- AC_CHECK_LIB(iconv, iconv,
-- [
-- iconv_libs="-liconv"
-- have_iconv="yes"
-- ])
-- fi
--
-- if test "x$have_iconv" != "xyes"; then
-- AC_CHECK_LIB(iconv_plug, iconv,
-- [
-- iconv_libs="-liconv -liconv_plug"
-- have_iconv="yes"
-- ])
-- fi
--
--fi
--AC_MSG_CHECKING(for explicit iconv link options)
--AC_MSG_RESULT($iconv_libs)
--
--AC_SUBST(iconv_cflags)
--AC_SUBST(iconv_libs)
--
--
- # SDL library (ecore_sdl)
-
- have_sdl="no"
-@@ -790,7 +751,7 @@
- ECORE_CHECK_MODULE([Job], [${want_ecore_job}])
-
- # ecore_txt
--ECORE_CHECK_MODULE([Txt], [${want_ecore_txt}], [$have_iconv])
-+ECORE_CHECK_MODULE([Txt], [${want_ecore_txt}])
-
- # ecore_con
- ECORE_CHECK_MODULE([Con], [${want_ecore_con}])
-Index: ecore/src/lib/ecore_txt/Makefile.am
-===================================================================
---- ecore.orig/src/lib/ecore_txt/Makefile.am 2009-11-13 13:16:12.000000000 +0100
-+++ ecore/src/lib/ecore_txt/Makefile.am 2009-11-19 01:08:47.619349166 +0100
-@@ -3,8 +3,7 @@
- AM_CPPFLAGS = \
- -I$(top_srcdir)/src/lib/ecore \
- -I$(top_builddir)/src/lib/ecore \
--@EFL_ECORE_TXT_BUILD@ \
--@iconv_cflags@
-+@EFL_ECORE_TXT_BUILD@
-
- if BUILD_ECORE_TXT
-
-@@ -16,8 +15,7 @@
- libecore_txt_la_SOURCES = \
- ecore_txt.c
-
--libecore_txt_la_LIBADD = @iconv_libs@ \
--@EINA_LIBS@
-+libecore_txt_la_LIBADD = $(LTLIBICONV) @EINA_LIBS@
-
- libecore_txt_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @ecore_txt_release_info@
-
diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb
index 934a52f1e4..cef420b21d 100644
--- a/recipes/efl1/ecore_svn.bb
+++ b/recipes/efl1/ecore_svn.bb
@@ -2,12 +2,12 @@ require ecore.inc
SRCREV = "${EFL_SRCREV}"
PR = "r12"
-SRC_URI += "\
- file://iconv.patch;maxrev=43996 \
- file://exit_uclibc_dns.patch;maxrev=47076 \
- file://exit_uclibc.patch;maxrev=50815 \
- file://exit_uclibc_newer.patch;minrev=50816 \
+SRC_URI = "\
+ ${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \
+ file://exit_uclibc.patch \
+ file://fix-ecore-fb-initialization.patch \
"
+S = "${WORKDIR}/${SRCNAME}"
ECORE_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
diff --git a/recipes/efl1/edb_svn.bb b/recipes/efl1/edb_svn.bb
index 385bc1190b..4f7e58d7df 100644
--- a/recipes/efl1/edb_svn.bb
+++ b/recipes/efl1/edb_svn.bb
@@ -3,8 +3,9 @@ LICENSE = "MIT BSD"
DEPENDS = "zlib"
PV = "1.0.5.050+svnr${SRCPV}"
PR = "r1"
-SRCREV = "${EFL_SRCREV}"
+SRCREV = "${EFL_SRCREV_1.0.0}"
inherit efl
-SRC_URI = "svn://svn.enlightenment.org/svn/e/OLD;module=edb;proto=http;scmdata=keep"
+SRC_URI = "${E_SVN}/OLD;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
diff --git a/recipes/efl1/edbus_svn.bb b/recipes/efl1/edbus_svn.bb
index 8004e1db23..8d10370596 100644
--- a/recipes/efl1/edbus_svn.bb
+++ b/recipes/efl1/edbus_svn.bb
@@ -8,6 +8,8 @@ SRCREV = "${EFL_SRCREV}"
inherit efl
SRCNAME = "e_dbus"
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "--enable-build-test-gui"
diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb
index 16dd7ac541..1018d048bc 100644
--- a/recipes/efl1/edje_svn.bb
+++ b/recipes/efl1/edje_svn.bb
@@ -7,6 +7,9 @@ SRCREV = "${EFL_SRCREV}"
inherit efl
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
+
# The new lua stuff is a bit broken...
do_configure_append() {
for i in $(find "${S}" -name "Makefile") ; do
diff --git a/recipes/efl1/eet_svn.bb b/recipes/efl1/eet_svn.bb
index 45a66fe4d7..cb3c578c27 100644
--- a/recipes/efl1/eet_svn.bb
+++ b/recipes/efl1/eet_svn.bb
@@ -6,6 +6,8 @@ PV = "1.3.2+svnr${SRCPV}"
PR = "r2"
inherit efl
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
BBCLASSEXTEND="native"
diff --git a/recipes/efl1/eeze_svn.bb b/recipes/efl1/eeze_svn.bb
index c65d65a340..768189e5aa 100644
--- a/recipes/efl1/eeze_svn.bb
+++ b/recipes/efl1/eeze_svn.bb
@@ -7,5 +7,8 @@ SRCREV = "${EFL_SRCREV}"
inherit efl
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
+
# Some upgrade path tweaking
AUTO_LIBNAME_PKGS = ""
diff --git a/recipes/efl1/eflpp_svn.bb b/recipes/efl1/eflpp_svn.bb
index 2028178846..aa5097f10b 100644
--- a/recipes/efl1/eflpp_svn.bb
+++ b/recipes/efl1/eflpp_svn.bb
@@ -8,8 +8,8 @@ PV = "0.1.0+svnr${SRCPV}"
PR = "r1"
inherit efl
+SRCNAME = "cxx"
+SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS;module=cxx;proto=http;scmdata=keep"
-S = "${WORKDIR}/cxx"
diff --git a/recipes/efl1/efreet_svn.bb b/recipes/efl1/efreet_svn.bb
index d988f52a6b..2d2c7276be 100644
--- a/recipes/efl1/efreet_svn.bb
+++ b/recipes/efl1/efreet_svn.bb
@@ -6,6 +6,8 @@ PR = "r4"
SRCREV = "${EFL_SRCREV}"
inherit efl
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
PACKAGES =+ "${PN}-mime ${PN}-trash"
FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*"
diff --git a/recipes/efl1/eina_svn.bb b/recipes/efl1/eina_svn.bb
index 406db18fa4..b4e9615627 100644
--- a/recipes/efl1/eina_svn.bb
+++ b/recipes/efl1/eina_svn.bb
@@ -5,6 +5,8 @@ PR = "r1"
SRCREV = "${EFL_SRCREV}"
inherit efl
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
# Some upgrade path tweaking
AUTO_LIBNAME_PKGS = ""
diff --git a/recipes/efl1/elementary-theme-efenniht_svn.bb b/recipes/efl1/elementary-theme-efenniht_svn.bb
index c6616e3f31..2e8ac8a484 100644
--- a/recipes/efl1/elementary-theme-efenniht_svn.bb
+++ b/recipes/efl1/elementary-theme-efenniht_svn.bb
@@ -6,8 +6,8 @@ RSUGGESTS_${PN} = "e-wm-theme-illume-efenniht"
PACKAGE_ARCH = "all"
LICENSE = "MIT/BSD"
-SRCREV_pn-elementary-theme-efenniht_THM_REV ?= "${EFL_SRCREV}"
-SRCREV_pn-elementary-theme-efenniht_ELM_REV ?= "${EFL_SRCREV}"
+SRCREV_pn-elementary-theme-efenniht_THM_REV ?= "${EFL_SRCREV_1.0.0}"
+SRCREV_pn-elementary-theme-efenniht_ELM_REV ?= "${EFL_SRCREV_1.0.0}"
SRCREV_FORMAT = "THM_REV"
PV = "0.0+svnr${SRCPV}"
@@ -16,8 +16,9 @@ PACKAGE_ARCH = "all"
inherit e-base
SRCNAME = "efenniht"
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/THEMES;module=${SRCNAME};proto=http;name=THM_REV"
-SRC_URI += "svn://svn.enlightenment.org/svn/e/trunk/TMP/st/elementary/data;module=themes;proto=http;name=ELM_REV"
+SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http;name=THM_REV"
+SRC_URI += "${E_SVN}/trunk/elementary/data;module=themes;proto=http;name=ELM_REV"
+S = "${WORKDIR}/${SRCNAME}"
do_compile() {
${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/images -id ${WORKDIR}/themes/ ${S}/elm-efenniht.edc -o ${S}/elm-efenniht.edj
diff --git a/recipes/efl1/elementary_svn.bb b/recipes/efl1/elementary_svn.bb
index 3a8082bbe1..6276d00b84 100644
--- a/recipes/efl1/elementary_svn.bb
+++ b/recipes/efl1/elementary_svn.bb
@@ -6,15 +6,14 @@ PR = "r11"
SRCREV = "${EFL_SRCREV}"
inherit efl
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "\
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
--with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
"
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=elementary;proto=http;scmdata=keep"
-S = "${WORKDIR}/elementary"
-
do_compile_append() {
sed -i -e s:${STAGING_DIR_TARGET}::g \
-e s:/${TARGET_SYS}::g \
diff --git a/recipes/efl1/embryo_svn.bb b/recipes/efl1/embryo_svn.bb
index 24cf2ab936..325f0d35ba 100644
--- a/recipes/efl1/embryo_svn.bb
+++ b/recipes/efl1/embryo_svn.bb
@@ -5,6 +5,8 @@ PR = "r2"
SRCREV = "${EFL_SRCREV}"
inherit efl
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
# Some upgrade path tweaking
AUTO_LIBNAME_PKGS = ""
diff --git a/recipes/efl1/emotion_svn.bb b/recipes/efl1/emotion_svn.bb
index c453adcc66..9d7c16ac9a 100644
--- a/recipes/efl1/emotion_svn.bb
+++ b/recipes/efl1/emotion_svn.bb
@@ -2,11 +2,12 @@ DESCRIPTION = "The Enlightenment multimedia library"
LICENSE = "MIT BSD"
# we no longer build the libxine backend, since the gstreamer backend seems more promising
DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
-PV = "0.1.0.042+svnr${SRCPV}"
-PR = "r4"
+PV = "0.2.0+svnr${SRCPV}"
SRCREV = "${EFL_SRCREV}"
inherit efl
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "--disable-xine --enable-gstreamer --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
diff --git a/recipes/efl1/engrave_svn.bb b/recipes/efl1/engrave_svn.bb
index 30a523dbe4..fefd6d43d8 100644
--- a/recipes/efl1/engrave_svn.bb
+++ b/recipes/efl1/engrave_svn.bb
@@ -4,8 +4,8 @@ LICENSE = "MIT"
DEPENDS = "evas ecore"
PV = "0.0.0+svnr${SRCPV}"
PR = "r1"
-SRCREV = "${EFL_SRCREV}"
+SRCREV = "${EFL_SRCREV_1.0.0}"
inherit efl
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/OLD;module=${PN};proto=http;scmdata=keep"
+SRC_URI = "${E_SVN}/OLD;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
diff --git a/recipes/efl1/enhance_svn.bb b/recipes/efl1/enhance_svn.bb
index 40fa859a3c..ebbca70a86 100644
--- a/recipes/efl1/enhance_svn.bb
+++ b/recipes/efl1/enhance_svn.bb
@@ -3,8 +3,8 @@ LICENSE = "MIT"
DEPENDS = "exml"
PV = "0.0.1+svnr${SRCPV}"
PR = "r1"
-SRCREV = "${EFL_SRCREV}"
+SRCREV = "${EFL_SRCREV_1.0.0}"
inherit efl
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/OLD;module=${PN};proto=http;scmdata=keep"
+SRC_URI = "${E_SVN}/OLD;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
diff --git a/recipes/efl1/epdf_svn.bb b/recipes/efl1/epdf_svn.bb
index 89396d2181..80adfb5cc6 100644
--- a/recipes/efl1/epdf_svn.bb
+++ b/recipes/efl1/epdf_svn.bb
@@ -6,6 +6,8 @@ PR = "r4"
SRCREV = "${EFL_SRCREV}"
inherit efl
+SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "\
--enable-poppler \
@@ -13,8 +15,6 @@ EXTRA_OECONF = "\
--disable-mupdf \
"
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=epdf;proto=http;scmdata=keep"
-
# Some upgrade path tweaking, as in evas
AUTO_LIBNAME_PKGS = ""
diff --git a/recipes/efl1/epeg_svn.bb b/recipes/efl1/epeg_svn.bb
index 9dffb749ec..1ad5c369b2 100644
--- a/recipes/efl1/epeg_svn.bb
+++ b/recipes/efl1/epeg_svn.bb
@@ -3,8 +3,8 @@ LICENSE = "MIT"
DEPENDS = "jpeg"
PV = "0.9.0+svnr${SRCPV}"
PR = "r2"
-SRCREV = "${EFL_SRCREV}"
+SRCREV = "${EFL_SRCREV_1.0.0}"
inherit efl
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/OLD;module=epeg;proto=http;scmdata=keep"
+SRC_URI = "${E_SVN}/OLD;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
diff --git a/recipes/efl1/esmart_svn.bb b/recipes/efl1/esmart_svn.bb
index baa682ed22..d326370a04 100644
--- a/recipes/efl1/esmart_svn.bb
+++ b/recipes/efl1/esmart_svn.bb
@@ -3,11 +3,11 @@ LICENSE = "MIT BSD"
DEPENDS = "evas ecore edje imlib2 libtool"
PV = "0.9.0.050+svnr${SRCPV}"
PR = "r2"
-SRCREV = "${EFL_SRCREV}"
+SRCREV = "${EFL_SRCREV_1.0.0}"
inherit efl
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/OLD;module=${PN};proto=http;scmdata=keep"
+SRC_URI = "${E_SVN}/OLD;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
diff --git a/recipes/efl1/ethumb_svn.bb b/recipes/efl1/ethumb_svn.bb
index 01fe9812c4..428b6529be 100644
--- a/recipes/efl1/ethumb_svn.bb
+++ b/recipes/efl1/ethumb_svn.bb
@@ -5,6 +5,8 @@ PV = "0.1.0+svnr${SRCPV}"
SRCREV = "${EFL_SRCREV}"
inherit efl
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "\
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
diff --git a/recipes/efl1/evas_svn.bb b/recipes/efl1/evas_svn.bb
index 86d8533a9d..c93bc84c4e 100644
--- a/recipes/efl1/evas_svn.bb
+++ b/recipes/efl1/evas_svn.bb
@@ -1,4 +1,9 @@
require evas.inc
+
+SRC_URI = "\
+ ${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \
+"
+S = "${WORKDIR}/${SRCNAME}"
PR = "r8"
EVAS_CPU_TWEAKS = ""
diff --git a/recipes/efl1/ewl_svn.bb b/recipes/efl1/ewl_svn.bb
index e6b70e1af3..0c9d7ca0ec 100644
--- a/recipes/efl1/ewl_svn.bb
+++ b/recipes/efl1/ewl_svn.bb
@@ -3,11 +3,11 @@ DEPENDS = "evas ecore edje emotion efreet"
LICENSE = "MIT BSD"
PV = "0.5.3.050+svnr${SRCPV}"
PR = "r2"
-SRCREV = "${EFL_SRCREV}"
+SRCREV = "${EFL_SRCREV_1.0.0}"
inherit efl
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/BROKEN;module=${PN};proto=http;scmdata=keep"
+SRC_URI = "${E_SVN}/BROKEN;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "\
--enable-software-x11 \
diff --git a/recipes/efl1/exml_svn.bb b/recipes/efl1/exml_svn.bb
index 37f4d671e2..251da8427d 100644
--- a/recipes/efl1/exml_svn.bb
+++ b/recipes/efl1/exml_svn.bb
@@ -3,8 +3,8 @@ LICENSE = "MIT"
DEPENDS = "libxml2 libxslt ecore"
PV = "0.1.1+svnr${SRCPV}"
PR = "r2"
-SRCREV = "${EFL_SRCREV}"
+SRCREV = "${EFL_SRCREV_1.0.0}"
inherit efl
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/BROKEN;module=${PN};proto=http;scmdata=keep"
+SRC_URI = "${E_SVN}/BROKEN;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
diff --git a/recipes/efl1/imlib2_svn.bb b/recipes/efl1/imlib2_svn.bb
index c0616be181..96f66bf98f 100644
--- a/recipes/efl1/imlib2_svn.bb
+++ b/recipes/efl1/imlib2_svn.bb
@@ -8,6 +8,8 @@ PR = "r2"
SRCREV = "${EFL_SRCREV}"
inherit efl
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "--with-x \
--x-includes=${STAGING_INCDIR} \
diff --git a/recipes/efl1/libeflvala_svn.bb b/recipes/efl1/libeflvala_svn.bb
index b42c57cc74..6c56ba4f93 100644
--- a/recipes/efl1/libeflvala_svn.bb
+++ b/recipes/efl1/libeflvala_svn.bb
@@ -10,7 +10,8 @@ SRCNAME = "vala"
inherit e-base autotools pkgconfig vala
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS;module=${SRCNAME};proto=http;scmdata=keep"
+SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};proto=http"
+S = "${WORKDIR}/${SRCNAME}"
PACKAGES =+ "${PN}-examples"
FILES_${PN}-examples = "${datadir}/libeflvala ${bindir}/*"
diff --git a/recipes/efl1/libeweather_svn.bb b/recipes/efl1/libeweather_svn.bb
index 7403c09b6b..9053c90c53 100644
--- a/recipes/efl1/libeweather_svn.bb
+++ b/recipes/efl1/libeweather_svn.bb
@@ -6,12 +6,11 @@ PR = "r0"
SRCREV = "${EFL_SRCREV}"
inherit efl
+SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=libeweather;proto=http;scmdata=keep"
-S = "${WORKDIR}/eweather"
-
RSUGGESTS_${PN} = "elementary-tests"
do_compile_append() {