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>

diff --git a/classes/e-base.bbclass b/classes/e-base.bbclass
index 969f15c..c27ba0e 100644 (file)
--- a/classes/e-base.bbclass
+++ b/classes/e-base.bbclass
@@ -1,8 +1,9 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "56329"
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=${SRCNAME};proto=http;scmdata=keep"
-S = "${WORKDIR}/${SRCNAME}"
+# usually tracks svn trunk HEAD
+EFL_SRCREV ?= "56372"
+# revision when 1.0.0 was released, for recipes which don't need rebuild so often
+EFL_SRCREV_1.0.0 ?= "56356"
 
 ARM_INSTRUCTION_SET = "arm"

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 1baecc1..0be7366 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -569,8 +569,8 @@ OE_STRICT_CHECKSUMS ?= "1"
 ADOBE_MIRROR = "http://fpdownload.macromedia.com/get/flashplayer/current/"
 APACHE_MIRROR = "http://archive.apache.org/dist"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
-E_CVS = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e" 
-E_URI = "http://enlightenment.freedesktop.org/files"
+E_MIRROR = "http://download.enlightenment.org/releases"
+E_SVN = "svn://svn.enlightenment.org/svn/e"
 FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
 FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
 FREESMARTPHONE_GIT = "git://git.freesmartphone.org"

diff --git a/recipes/e17/e-module.inc b/recipes/e17/e-module.inc
index a620746..185c841 100644 (file)
--- a/recipes/e17/e-module.inc
+++ b/recipes/e17/e-module.inc
@@ -7,6 +7,8 @@ SRCREV = "${EFL_SRCREV}"
 SRCNAME = "E-MODULES-EXTRA/${PN}"
 
 inherit e
+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/e17/e-wm-theme-illume-efenniht_svn.bb b/recipes/e17/e-wm-theme-illume-efenniht_svn.bb
index 2e20784..60df582 100644 (file)
--- a/recipes/e17/e-wm-theme-illume-efenniht_svn.bb
+++ b/recipes/e17/e-wm-theme-illume-efenniht_svn.bb
@@ -7,13 +7,14 @@ RSUGGESTS_${PN} = "elementary-theme-efenniht"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT/BSD"
 
-SRCREV = "${EFL_SRCREV}"
+SRCREV = "${EFL_SRCREV_1.0.0}"
 PV = "0.0+svnr${SRCPV}"
 
 inherit e-base
 
 SRCNAME = "efenniht"
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/THEMES;module=${SRCNAME};proto=http"
+SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http"
+S = "${WORKDIR}/${SRCNAME}"
 
 do_compile() {
        ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/images ${S}/efenniht.edc -o ${S}/efenniht.edj

diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb
index 397272d..9c9f0e1 100644 (file)
--- a/recipes/e17/e-wm_svn.bb
+++ b/recipes/e17/e-wm_svn.bb
@@ -8,7 +8,8 @@ SRCREV = "${EFL_SRCREV}"
 
 inherit e update-alternatives
 
-SRC_URI += "\
+SRC_URI = "\
+  ${E_SVN}/trunk;module=${SRCNAME};proto=http \
   file://enlightenment_start.oe \
   file://applications.menu \
   file://gsm-segfault-fix.patch;maxrev=37617 \

diff --git a/recipes/e17/edje-viewer_svn.bb b/recipes/e17/edje-viewer_svn.bb
index c575796..3056540 100644 (file)
--- a/recipes/e17/edje-viewer_svn.bb
+++ b/recipes/e17/edje-viewer_svn.bb
@@ -8,5 +8,7 @@ SRCREV = "${EFL_SRCREV}"
 inherit e
 
 SRCNAME = "edje_viewer"
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
 
 FILES_${PN} += "${datadir}"

diff --git a/recipes/e17/elementary-alarm_svn.bb b/recipes/e17/elementary-alarm_svn.bb
index 24bbd60..c930a0c 100644 (file)
--- a/recipes/e17/elementary-alarm_svn.bb
+++ b/recipes/e17/elementary-alarm_svn.bb
@@ -7,9 +7,8 @@ PR = "r2"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=elementary-alarm;proto=http"
-S = "${WORKDIR}/elementary-alarm"
+SRC_URI = "${E_SVN}/trunk/TMP/st;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
 
 RDEPENDS_${PN} = "waker"
 FILES_${PN} += "${bindir}/*"

diff --git a/recipes/e17/elmdentica_svn.bb b/recipes/e17/elmdentica_svn.bb
index 3657f7f..013a7de 100644 (file)
--- a/recipes/e17/elmdentica_svn.bb
+++ b/recipes/e17/elmdentica_svn.bb
@@ -6,6 +6,8 @@ HOMEPAGE = "http://elmdentica.googlecode.com"
 AUTHOR = "seabra"
 
 inherit e gettext
+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/e17/emprint_svn.bb b/recipes/e17/emprint_svn.bb
index 7f63083..31c744d 100644 (file)
--- a/recipes/e17/emprint_svn.bb
+++ b/recipes/e17/emprint_svn.bb
@@ -2,11 +2,10 @@ DESCRIPTION = "Emprint is a utility for taking screenshots of the entire screen,
 LICENSE = "MIT BSD"
 DEPENDS = "imlib2 virtual/libx11 ecore evas edje eina"
 PV = "0.0.1+svnr${SRCPV}"
+SRCREV = "${EFL_SRCREV}"
 
 inherit e
-
-SRCREV = "${EFL_SRCREV}"
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/;module=emprint;proto=http"
-S = "${WORKDIR}/emprint"
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
 
 FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug"

diff --git a/recipes/e17/enjoy_svn.bb b/recipes/e17/enjoy_svn.bb
index 97b110c..eab81b4 100644 (file)
--- a/recipes/e17/enjoy_svn.bb
+++ b/recipes/e17/enjoy_svn.bb
@@ -21,7 +21,8 @@ RDEPENDS += "\
        "
 
 inherit e
-
+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/e17/entrance_0.9.0.010.bb b/recipes/e17/entrance_0.9.0.010.bb
index e72e4a6..605f0bf 100644 (file)
--- a/recipes/e17/entrance_0.9.0.010.bb
+++ b/recipes/e17/entrance_0.9.0.010.bb
@@ -9,6 +9,8 @@ PR = "r3"
 SRCREV = "46589"
 
 inherit e
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
 
 SRC_URI += "\
            file://rebased_config-db.patch \

diff --git a/recipes/e17/eve_svn.bb b/recipes/e17/eve_svn.bb
index 66e5add..d7f93e9 100644 (file)
--- a/recipes/e17/eve_svn.bb
+++ b/recipes/e17/eve_svn.bb
@@ -5,6 +5,8 @@ PV = "0.3.0.0+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
 
 SRC_URI += "file://eve-theme-for-smaller-screens.patch"
 

diff --git a/recipes/e17/exalt_svn.bb b/recipes/e17/exalt_svn.bb
index 4696b72..712204f 100644 (file)
--- a/recipes/e17/exalt_svn.bb
+++ b/recipes/e17/exalt_svn.bb
@@ -10,6 +10,8 @@ SRCREV = "${EFL_SRCREV}"
 PR = "r1"
 
 inherit e
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
 
 EXTRA_OECONF = " \
 --with-wpa_supplicant=${sbindir}/wpa_supplicant \

diff --git a/recipes/e17/expedite_svn.bb b/recipes/e17/expedite_svn.bb
index efb1145..47b5f48 100644 (file)
--- a/recipes/e17/expedite_svn.bb
+++ b/recipes/e17/expedite_svn.bb
@@ -7,6 +7,8 @@ PR = "r5"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"
 
 EXTRA_OECONF = "\
   --x-includes=${STAGING_INCDIR}/X11 \

diff --git a/recipes/e17/exquisite-theme-illume.bb b/recipes/e17/exquisite-theme-illume.bb
index b15a8b5..c12405b 100644 (file)
--- a/recipes/e17/exquisite-theme-illume.bb
+++ b/recipes/e17/exquisite-theme-illume.bb
@@ -4,7 +4,7 @@ SECTION = "x11"
 DEPENDS = "edje-native"
 PV = "1.0+svnr${SRCPV}"
 PR = "r6"
-SRCREV = "${EFL_SRCREV}"
+SRCREV = "${EFL_SRCREV_1.0.0}"
 
 inherit e-base update-alternatives
 
@@ -15,7 +15,8 @@ ALTERNATIVE_PRIORITY = "10"
 
 SRCNAME = "b_and_w"
 
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/THEMES;module=${SRCNAME};proto=http"
+SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};proto=http"
+S = "${WORKDIR}/${SRCNAME}"
 
 do_compile() {
    ${STAGING_BINDIR_NATIVE}/edje_cc exquisite.edc illume.edj

diff --git a/recipes/e17/exquisite_svn.bb b/recipes/e17/exquisite_svn.bb
index d323c12..fcfb65c 100644 (file)
--- a/recipes/e17/exquisite_svn.bb
+++ b/recipes/e17/exquisite_svn.bb
@@ -10,6 +10,8 @@ RCONFLICTS_${PN} = "psplash virtual-psplash"
 SRCNAME = "exquisite"
 
 inherit e
+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/e17/rage_svn.bb b/recipes/e17/rage_svn.bb
index edf6e69..2823987 100644 (file)
--- a/recipes/e17/rage_svn.bb
+++ b/recipes/e17/rage_svn.bb
@@ -8,3 +8,5 @@ PV = "0.3.0.042+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e
+SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep"
+S = "${WORKDIR}/${SRCNAME}"

diff --git a/recipes/e17/waker_svn.bb b/recipes/e17/waker_svn.bb
index b1707d4..73e7235 100644 (file)
--- a/recipes/e17/waker_svn.bb
+++ b/recipes/e17/waker_svn.bb
@@ -8,8 +8,8 @@ SRCREV = "${EFL_SRCREV}"
 
 inherit efl
 
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=waker;proto=http"
-S = "${WORKDIR}/waker"
+SRC_URI = "${E_SVN}/trunk/TMP/st;module=${SRCNAME};proto=http"
+S = "${WORKDIR}/${SRCNAME}"
 
 FILES_${PN} += "${bindir}/* ${libdir}/lib*.so.*"
 FILES_${PN} += "/etc/X11/Xsession.d/80x-enlightenment-wakerd"

diff --git a/recipes/efl1/azy_svn.bb b/recipes/efl1/azy_svn.bb
index 7e96c60..c7ee1f4 100644 (file)
--- 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 105aeed..3d04453 100644 (file)
--- 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 (file)
index 0be2d3d..0000000
--- 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 (file)
index 3d04453..0000000
--- 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 (file)
index 1652491..0000000
--- 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 934a52f..cef420b 100644 (file)
--- 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 385bc11..4f7e58d 100644 (file)
--- 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 8004e1d..8d10370 100644 (file)
--- 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 16dd7ac..1018d04 100644 (file)
--- 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 45a66fe..cb3c578 100644 (file)
--- 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 c65d65a..768189e 100644 (file)
--- 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 2028178..aa5097f 100644 (file)
--- 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 d988f52..2d2c727 100644 (file)
--- 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 406db18..b4e9615 100644 (file)
--- 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 c6616e3..2e8ac8a 100644 (file)
--- 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 3a8082b..6276d00 100644 (file)
--- 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 24cf2ab..325f0d3 100644 (file)
--- 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 c453adc..9d7c16a 100644 (file)
--- 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 30a523d..fefd6d4 100644 (file)
--- 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 40fa859..ebbca70 100644 (file)
--- 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 89396d2..80adfb5 100644 (file)
--- 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 9dffb74..1ad5c36 100644 (file)
--- 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 baa682e..d326370 100644 (file)
--- 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 01fe981..428b652 100644 (file)
--- 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 86d8533..c93bc84 100644 (file)
--- 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 e6b70e1..0c9d7ca 100644 (file)
--- 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 37f4d67..251da84 100644 (file)
--- 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 c0616be..96f66bf 100644 (file)
--- 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 b42c57c..6c56ba4 100644 (file)
--- 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 7403c09..9053c90 100644 (file)
--- 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() {

diff --git a/recipes/python/python-efl.inc b/recipes/python/python-efl.inc
index 5fc6b9c..f816305 100644 (file)
--- a/recipes/python/python-efl.inc
+++ b/recipes/python/python-efl.inc
@@ -15,7 +15,9 @@ export HOST_SYS
 
 inherit e-base autotools pkgconfig distutils-base
 
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS/python;module=${SRCNAME};proto=http"
+SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};proto=http"
+S = "${WORKDIR}/${SRCNAME}"
+
 
 do_configure_prepend() {
        # prefix CYTHON_.*_INCLUDEDIR with path to STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly