efl: update to 20080129, fix some LICENSE entries, enable software-x11-16 engine again

20 files changed, 47 insertions, 114 deletions

diff --git a/classes/efl_base.bbclass b/classes/efl_base.bbclass
index 3865441779..023b2edf74 100644
--- a/classes/efl_base.bbclass
+++ b/classes/efl_base.bbclass
@@ -3,7 +3,7 @@ inherit autotools pkgconfig
 SECTION = "e/libs"
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-07-10/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "http://download.enlightenment.org/snapshots/2008-01-25/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 do_stage() {
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index cff6d7316b..aaf7b02a09 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20080117"
+EFL_SRCDATE = "20080129"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -107,9 +107,9 @@ SRCDATE_entice ?= "${EFL_SRCDATE}"
 SRCDATE_entrance ?= "${EFL_SRCDATE}"
 SRCDATE_e-utils ?= "${EFL_SRCDATE}"
 SRCDATE_e-wm ?= "${EFL_SRCDATE}"
-SRCDATE_enna = "${EFL_SRCDATE}"
-#SRCDATE_enna ?= "${EFL_SRCDATE}"
+SRCDATE_enna ?= "${EFL_SRCDATE}"
 SRCDATE_exquisite ?= "${EFL_SRCDATE}"
+SRCDATE_rage ?= "${EFL_SRCDATE}"
 
 # Misc packages, sorted by alphabet
 SRCDATE_avetanabt ?= "20060814"
diff --git a/packages/e17/e-wm_0.16.999.041.bb b/packages/e17/e-wm_0.16.999.041.bb
deleted file mode 100644
index 51e9e0d189..0000000000
--- a/packages/e17/e-wm_0.16.999.041.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION = "E17 - the Enlightenment Window Mananger"
-DEPENDS = "eet evas ecore edje efreet"
-LICENSE = "MIT BSD"
-PR = "r0"
-
-DEFAULT_PREFERENCE = "-1"
-
-inherit e update-alternatives
-
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/enlightenment-${PV}.tar.gz \
-           file://fix-configure.patch;patch=1 \
-           file://set-autoscroll-defaults.patch;patch=1 \
-           file://Xsession.d/98enlightenment \
-           file://applications.menu \
-          "
-
-S = "${WORKDIR}/enlightenment-${PV}"
-
-PROFILE = "LOWRES_PDA"
-PROFILE_c7x0 = "HIRES_PDA"
-PROFILE_tosa = "HIRES_PDA"
-PROFILE_spitz = "HIRES_PDA"
-PROFILE_akita = "HIRES_PDA"
-
-EXTRA_OECONF = "--with-profile=${PROFILE} \
-                --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
-                --x-includes=${STAGING_INCDIR}/X11 \
-                --x-libraries=${STAGING_LIBDIR}"
-
-FILES_${PN} = "${bindir}/* ${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*.so ${libdir}/enlightenment/preload/*.so ${datadir} ${sysconfdir} ${libdir}/enlightenment/modules/cpufreq/*/freqset"
-FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.a ${libdir}/enlightenment/modules/*/*/*.la ${libdir}/enlightenment/preload/*.a ${libdir}/enlightenment/preload/*.la"
-FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/ ${libdir}/enlightenment/preload/.debug/"
-
-do_compile_prepend() {
-    find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-    find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
-}
-
-do_install_append() {
-	install -d ${D}/${sysconfdir}/X11/Xsession.d
-	install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d
-
-        install -d ${D}/${sysconfdir}/xdg/menus
-        install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
-}
-
-ALTERNATIVE_PATH = "${bindir}/enlightenment_start"
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "16"
diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb
index 04e2ec7d59..e7af400a1c 100644
--- a/packages/e17/e-wm_cvs.bb
+++ b/packages/e17/e-wm_cvs.bb
@@ -1,7 +1,7 @@
-DESCRIPTION = "E17 - the Enlightenment Window Mananger"
+DESCRIPTION = "The Enlightenment Window Mananger Version 17"
 DEPENDS = "eet evas ecore edje efreet"
 LICENSE = "MIT BSD"
-PV = "0.16.999.041+cvs${SRCDATE}"
+PV = "0.16.999.042+cvs${SRCDATE}"
 PR = "r0"
 
 inherit e update-alternatives
diff --git a/packages/e17/rage_0.2.0.005.bb b/packages/e17/rage_cvs.bb
index d2d6c3feae..3b7bed7a11 100644
--- a/packages/e17/rage_0.2.0.005.bb
+++ b/packages/e17/rage_cvs.bb
@@ -4,7 +4,10 @@ HOMEPAGE = "http://www.rasterman.com"
 LICENSE = "MIT BSD"
 DEPENDS = "evas ecore edje"
 SECTION = "x11/multimedia"
-
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/rage-${PV}.tar.gz"
+PV = "0.3.0.042+cvs${SRCDATE}"
 
 inherit autotools
+
+SRC_URI = "${E_CVS};module=misc/rage"
+S = "${WORKDIR}/rage"
+
diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index eacde2d012..6175c605c0 100644
--- a/packages/efl1/ecore.inc
+++ b/packages/efl1/ecore.inc
@@ -1,11 +1,9 @@
-DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \
-foundation libraries. It makes makes doing selections, drag and drop, event loops, \
-timeouts and idle handlers fast, optimized, and convenient."
-LICENSE = "MIT"
+DESCRIPTION = "Ecore is the Enlightenment application framework library"
+LICENSE = "MIT BSD"
 DEPENDS = "curl eet evas tslib"
 # optional
 # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
-PV = "0.9.9.041+cvs${SRCDATE}"
+PV = "0.9.9.042+cvs${SRCDATE}"
 
 inherit efl_library
 
diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb
index cea3d7602d..b0a2a24f98 100644
--- a/packages/efl1/ecore_cvs.bb
+++ b/packages/efl1/ecore_cvs.bb
@@ -1,5 +1,5 @@
 require ecore.inc
-PR = "r2"
+PR = "r0"
 
 EXTRA_OECONF = "\
         --x-includes=${STAGING_INCDIR}/X11 \
@@ -15,6 +15,7 @@ EXTRA_OECONF = "\
 		--disable-ecore-sdl \
 		--enable-ecore-fb \
 		--enable-ecore-evas \
+		--enable-ecore-evas-x11-16 \
         --disable-ecore-evas-x11-gl \
 		--enable-ecore-evas-xrender \
 		--disable-ecore-evas-dfb \
diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb
index 734dccf56e..e930fc4795 100644
--- a/packages/efl1/edje_cvs.bb
+++ b/packages/efl1/edje_cvs.bb
@@ -1,9 +1,8 @@
-DESCRIPTION = "Edje is a complex graphical design & layout library."
-# can also install vim data files
+DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
 DEPENDS = "eet evas ecore embryo edje-native"
 LICENSE = "MIT BSD"
-PV = "0.5.0.41+cvs${SRCDATE}"
-PR = "r2"
+PV = "0.5.0.042+cvs${SRCDATE}"
+PR = "r0"
 
 inherit efl_library
 
diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb
index f2ab6a7408..370b385bf8 100644
--- a/packages/efl1/eet_cvs.bb
+++ b/packages/efl1/eet_cvs.bb
@@ -1,10 +1,7 @@
-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."
+DESCRIPTION = "EET is the Enlightenment data storage library"
 DEPENDS = "zlib jpeg"
 LICENSE = "MIT BSD"
-PV = "0.9.10.041+cvs${SRCDATE}"
-PR = "r1"
+PV = "0.9.10.042+cvs${SRCDATE}"
+PR = "r0"
 
 inherit efl_library
diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb
index 248dadd9bf..a1a027fc8f 100644
--- a/packages/efl1/efreet_cvs.bb
+++ b/packages/efl1/efreet_cvs.bb
@@ -1,8 +1,7 @@
-DESCRIPTION = "An implementation of freedesktop.org specs for the \
-Enlightenment Foundation Libraries"
+DESCRIPTION = "The Enlightenment freedesktop.org library"
 DEPENDS = "ecore"
 LICENSE = "MIT BSD"
-PV = "0.0.3.003+cvs${SRCDATE}"
+PV = "0.0.3.042+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl_library
diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb
index 15546e206f..2f5ab176ce 100644
--- a/packages/efl1/embryo_cvs.bb
+++ b/packages/efl1/embryo_cvs.bb
@@ -1,10 +1,6 @@
-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."
+DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
 LICENSE = "MIT BSD"
-PV = "0.9.1.041+cvs${SRCDATE}"
-PR = "r1"
+PV = "0.9.1.042+cvs${SRCDATE}"
+PR = "r0"
 
 inherit efl_library
diff --git a/packages/efl1/emotion_cvs.bb b/packages/efl1/emotion_cvs.bb
index 84302e4793..36a5065e7a 100644
--- a/packages/efl1/emotion_cvs.bb
+++ b/packages/efl1/emotion_cvs.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = "Emotion is a multimedia library with backends: gstreamer and libxine"
-LICENSE = "MIT"
+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"
 RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
-PV = "0.0.1+cvs${SRCDATE}"
+PV = "0.1.0+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl_library
diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb
index 27c475c37d..fa4f4282e1 100644
--- a/packages/efl1/epdf_cvs.bb
+++ b/packages/efl1/epdf_cvs.bb
@@ -1,13 +1,11 @@
 DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
-LICENSE = "BSD"
-DEPENDS = "poppler evas ecore etk"
+LICENSE = "MIT BSD"
+DEPENDS = "poppler evas ecore etk ewl"
 PV = "0.1.0+cvs${SRCDATE}"
-PR = "r2"
+PR = "r0"
 
 inherit efl_library
 
-EXTRA_OECONF = "--disable-ewl"
-
 SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \
            file://fix-plugin-path-check.patch;HACK=1;patch=1"
 
diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb
index be2934dec8..8c71ef3e3d 100644
--- a/packages/efl1/epsilon_cvs.bb
+++ b/packages/efl1/epsilon_cvs.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Epsilon is a flexible and powerful image thumbnailing library \
 that is compliant with the freedesktop.org Thumbnail Managing Standard."
-LICENSE = "BSD"
+LICENSE = "MIT BSD"
 # can also depend on xine for movie thumbnails
 DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
-PV = "0.3.0+cvs${SRCDATE}"
+PV = "0.3.0.012+cvs${SRCDATE}"
 
 inherit efl_library
 
diff --git a/packages/efl1/esmart_cvs.bb b/packages/efl1/esmart_cvs.bb
index 17e1f42b95..fa35d60d30 100644
--- a/packages/efl1/esmart_cvs.bb
+++ b/packages/efl1/esmart_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ESmart is a collection of smart Evas objects"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 DEPENDS = "evas ecore edje imlib2 epsilon libtool"
-PV = "0.9.0+cvs${SRCDATE}"
+PV = "0.9.0.042+cvs${SRCDATE}"
 
 inherit efl_library
 
diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_cvs.bb
index 238d640a68..90df74e61c 100644
--- a/packages/efl1/etk_cvs.bb
+++ b/packages/efl1/etk_cvs.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+cvs${SRCDATE}"
-PR = "r1"
+PV = "0.1.0.042+cvs${SRCDATE}"
+PR = "r0"
 
 inherit efl_library
 
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index e05397067b..77ec2db308 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -1,18 +1,12 @@
-DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
-anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
-down to using normal X11 primitives such as pixmaps, lines and rectangles if \
-your CPU or graphics hardware are too slow."
+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.041+cvs${SRCDATE}"
+PV = "0.9.9.042+cvs${SRCDATE}"
 
 inherit efl_library
 
-# SRC_URI += "file://fix-configure.patch;patch=1"
-
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
-
 EXTRA_OECONF = "<override me>"
 
 python populate_packages_prepend () {
diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb
index d30a03d7c1..862cc51370 100644
--- a/packages/efl1/evas_cvs.bb
+++ b/packages/efl1/evas_cvs.bb
@@ -1,5 +1,5 @@
 require evas.inc
-PR = "r2"
+PR = "r0"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb
index 193efcbe18..15a777df67 100644
--- a/packages/efl1/ewl_cvs.bb
+++ b/packages/efl1/ewl_cvs.bb
@@ -1,10 +1,8 @@
-DESCRIPTION = "The Enlightened Widget Library, \
-a simple-to-use general purpose widget library \
-based on the enlightenment foundation libraries."
+DESCRIPTION = "The Enlightened Widget Library"
 DEPENDS = "evas ecore edje emotion efreet epsilon"
-LICENSE = "MIT"
-PV = "0.5.1+cvs${SRCDATE}"
-PR = "r2"
+LICENSE = "MIT BSD"
+PV = "0.5.2.042+cvs${SRCDATE}"
+PR = "r0"
 
 inherit efl_library
 
diff --git a/packages/efl1/imlib2_1.4.0.002.bb b/packages/efl1/imlib2_1.4.1.000.bb
index baee4b62b0..b0db13b5ce 100644
--- a/packages/efl1/imlib2_1.4.0.002.bb
+++ b/packages/efl1/imlib2_1.4.1.000.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipu
 LICENSE = "BSD"
 # can also depend on tiff34, ungif or gif, z, bz2, id3tag
 DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
-PR = "r2"
+PR = "r0"
 
 inherit efl_library