enlightenment: bump SRCREV in anticipation of new snapshot coming friday * systray is now part of e-wm, so adjust metadata * use lib-glibc override now it exists * fix upgrade paths for eina * fix upgrade paths for evas * fix upgrade paths for edje

6 files changed, 56 insertions, 30 deletions

diff --git a/recipes/angstrom/e-wm-config-angstrom.bb b/recipes/angstrom/e-wm-config-angstrom.bb
index 3117dd9366..139a23138f 100644
--- a/recipes/angstrom/e-wm-config-angstrom.bb
+++ b/recipes/angstrom/e-wm-config-angstrom.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Enlightenment DR17 theme for Angstrom"
 LICENSE = "MIT/BSD"
 DEPENDS = "edje-native eet-native"
 RDEPENDS = "e-wm"
-RRECOMMENDS_${PN} = "places systray"
+RRECOMMENDS_${PN} = "places"
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI = " \
           file://e.src \
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb
index a1adc22bf1..81ff5c074a 100644
--- a/recipes/e17/e-wm_svn.bb
+++ b/recipes/e17/e-wm_svn.bb
@@ -53,11 +53,10 @@ RDEPENDS_${PN} += "\
 "
 
 # Uclibc build don't have 'glibc-utils'
-# I suspect the workaround below breaks eglibc, though. Koen - 20081125
-RDEPENDS_${PN}_append_linux = " glibc-utils "
-RDEPENDS_${PN}_append_linux-gnueabi = " glibc-utils "
-RDEPENDS_${PN}_append_linux-uclibc = " uclibc-utils "
-RDEPENDS_${PN}_append_linux-uclibcgnueabi = " uclibc-utils "
+RDEPENDS_${PN}_append_libc-glibc = " glibc-utils "
+
+# The systray module used to be external, but is part of e-wm now
+RREPLACES_${PN} = "systray"
 
 PACKAGES =+ "\
   ${PN}-config-default \
diff --git a/recipes/e17/systray_svn.bb b/recipes/e17/systray_svn.bb
deleted file mode 100644
index 3c0a8c7e71..0000000000
--- a/recipes/e17/systray_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-LICENSE = "MIT"
-PV = "0.0.1+svnr${SRCREV}"
-
-require e-module.inc
-
-
-
-
diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb
index 31d47e6fb8..9b8bc6a452 100644
--- a/recipes/efl1/edje_svn.bb
+++ b/recipes/efl1/edje_svn.bb
@@ -14,9 +14,9 @@ PACKAGES =+ "${PN}-utils"
 RDEPENDS_${PN}-utils = "cpp cpp-symlinks embryo-tests"
 
 RRECOMMENDS_${PN}-utils = "\
-  libevas-saver-png \
-  libevas-saver-jpeg \
-  libevas-saver-eet \
+  evas-saver-png \
+  evas-saver-jpeg \
+  evas-saver-eet \
 "
 
 DEBIAN_NOAUTONAME_${PN}-utils = "1"
diff --git a/recipes/efl1/eina_svn.bb b/recipes/efl1/eina_svn.bb
index f38c4c5b36..4baa03b297 100644
--- a/recipes/efl1/eina_svn.bb
+++ b/recipes/efl1/eina_svn.bb
@@ -5,4 +5,9 @@ PR = "r0"
 
 inherit efl
 
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+RREPLACES_${PN} = "libeina-ver-pre-svn-00-0 libeina-ver-pre-svn-01-0"
+
 FILES_${PN} += "${libdir}/eina"
diff --git a/recipes/efl1/evas.inc b/recipes/efl1/evas.inc
index 9561cfedc6..d52a749999 100644
--- a/recipes/efl1/evas.inc
+++ b/recipes/efl1/evas.inc
@@ -20,7 +20,7 @@ python populate_packages_prepend () {
             basedir = bb.data.expand( '${libdir}/evas/modules/%s' % plugin_type, d )
 
             do_split_packages(d, basedir, '^(.*)',
-            output_pattern = 'libevas-' + plugin_type[:-1] + "-%s",
+            output_pattern = 'evas-' + plugin_type[:-1] + "-%s",
             description = 'Evas module %s',
             allow_dirs=True, recursive=False, extra_depends="" )
 }
@@ -32,22 +32,52 @@ do_install_append() {
 FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
 FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
 
-PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
+PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-*"
 
 RRECOMMENDS_${PN} = "\
-  libevas-engine-buffer \
-  libevas-engine-fb \
-  libevas-engine-software-generic \
-  libevas-engine-software-x11 \
-  libevas-engine-software-16 \
-  libevas-engine-software-16-x11 \
-  libevas-engine-xrender-x11 \
+  evas-engine-buffer \
+  evas-engine-fb \
+  evas-engine-software-generic \
+  evas-engine-software-x11 \
+  evas-engine-software-16 \
+  evas-engine-software-16-x11 \
+  evas-engine-xrender-x11 \
   \
-  libevas-loader-png \
-  libevas-loader-jpeg \
-  libevas-loader-eet \
+  evas-loader-png \
+  evas-loader-jpeg \
+  evas-loader-eet \
 "
 
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+RREPLACES_${PN} = "libevas-ver-pre-svn-00-0 libevas-ver-pre-svn-01-0"
+
+RREPLACES_${PN}-tests = "libevas-ver-pre-svn-00-tests libevas-ver-pre-svn-01-tests"
+
+RREPLACES_evas-loader-pmaps = "liblibevas-ver-pre-svn-00-loader-pmaps libevas-ver-pre-svn-00-loader-pmaps "
+RREPLACES_evas-loader-eet = "liblibevas-ver-pre-svn-00-loader-eet libevas-ver-pre-svn-00-loader-eet "
+RREPLACES_evas-loader-jpeg = "liblibevas-ver-pre-svn-00-loader-jpeg libevas-ver-pre-svn-00-loader-jpeg "
+RREPLACES_evas-loader-tiff = "liblibevas-ver-pre-svn-00-loader-tiff libevas-ver-pre-svn-00-loader-tiff "
+RREPLACES_evas-loader-png = "liblibevas-ver-pre-svn-00-loader-png libevas-ver-pre-svn-00-loader-png "
+RREPLACES_evas-loader-xpm = "liblibevas-ver-pre-svn-00-loader-xpm libevas-ver-pre-svn-00-loader-xpm "
+
+RREPLACES_evas-saver-pmaps = "liblibevas-ver-pre-svn-00-saver-pmaps libevas-ver-pre-svn-00-saver-pmaps "
+RREPLACES_evas-saver-eet = "liblibevas-ver-pre-svn-00-saver-eet libevas-ver-pre-svn-00-saver-eet "
+RREPLACES_evas-saver-jpeg = "liblibevas-ver-pre-svn-00-saver-jpeg libevas-ver-pre-svn-00-saver-jpeg "
+RREPLACES_evas-saver-tiff = "liblibevas-ver-pre-svn-00-saver-tiff libevas-ver-pre-svn-00-saver-tiff "
+RREPLACES_evas-saver-png = "liblibevas-ver-pre-svn-00-saver-png libevas-ver-pre-svn-00-saver-png "
+RREPLACES_evas-saver-xpm = "liblibevas-ver-pre-svn-00-saver-xpm libevas-ver-pre-svn-00-saver-xpm "
+
+RREPLACES_evas-engine-fb = "liblibevas-ver-pre-svn-00-engine-fb libevas-ver-pre-svn-00-engine-fb "
+RREPLACES_evas-engine-software-generic = "liblibevas-ver-pre-svn-00-engine-software-generic libevas-ver-pre-svn-00-engine-software-generic "
+RREPLACES_evas-engine-software-16 = "liblibevas-ver-pre-svn-00-engine-software-16 libevas-ver-pre-svn-00-engine-software-16 "
+RREPLACES_evas-engine-buffer = "liblibevas-ver-pre-svn-00-engine-buffer libevas-ver-pre-svn-00-engine-buffer "
+RREPLACES_evas-engine-xrender-x11 = "liblibevas-ver-pre-svn-00-engine-xrender-x11 libevas-ver-pre-svn-00-engine-xrender-x11 "
+RREPLACES_evas-engine-software-x11 = "liblibevas-ver-pre-svn-00-engine-software-x11 libevas-ver-pre-svn-00-engine-software-x11 "
+
+
+
 # disabling this, since (due to OE bugs) it drags in whole Gtk+
 #RRECOMMENDS_${PN} += "\
 #  libevas-loader-svg \