22 files changed, 133 insertions, 100 deletions
diff --git a/packages/e17/e-utils_cvs.bb b/packages/e17/e-utils_cvs.bb
index ea27040ab2..6335f03b43 100644
--- a/packages/e17/e-utils_cvs.bb
+++ b/packages/e17/e-utils_cvs.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Enlightenment Window Manager Utilities"
 DEPENDS = "eet evas ecore edje esmart ewl engrave"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
diff --git a/packages/e17/e-wm_0.16.999.038.bb b/packages/e17/e-wm_0.16.999.038.bb
deleted file mode 100644
index 12784ea18f..0000000000
--- a/packages/e17/e-wm_0.16.999.038.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "E17 - the Enlightenment Window Mananger"
-DEPENDS = "eet evas ecore edje efreet"
-LICENSE = "MIT"
-PR = "r7"
-
-inherit e update-alternatives
-
-SRC_URI = "${E_URI}/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_0.16.999.041.bb b/packages/e17/e-wm_0.16.999.041.bb
index 4e6457cc2e..51e9e0d189 100644
--- a/packages/e17/e-wm_0.16.999.041.bb
+++ b/packages/e17/e-wm_0.16.999.041.bb
@@ -1,8 +1,10 @@
 DESCRIPTION = "E17 - the Enlightenment Window Mananger"
 DEPENDS = "eet evas ecore edje efreet"
-LICENSE = "MIT"
+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 \
diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb
new file mode 100644
index 0000000000..04e2ec7d59
--- /dev/null
+++ b/packages/e17/e-wm_cvs.bb
@@ -0,0 +1,61 @@
+DESCRIPTION = "E17 - the Enlightenment Window Mananger"
+DEPENDS = "eet evas ecore edje efreet"
+LICENSE = "MIT BSD"
+PV = "0.16.999.041+cvs${SRCDATE}"
+PR = "r0"
+
+inherit e update-alternatives
+
+SRC_URI = "${E_CVS};module=e17/apps/e \
+           file://Xsession.d/98enlightenment \
+           file://applications.menu \
+           file://Makefile.in.in \
+"
+S = "${WORKDIR}/e"
+
+EXTRA_OECONF = "\
+  --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+  --x-includes=${STAGING_INCDIR}/X11 \
+  --x-libraries=${STAGING_LIBDIR} \
+  --enable-simple-x11 \
+"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/Makefile.in.in po/
+	echo "install -d $*" >./mkinstalldirs
+	chmod a+rx ./mkinstalldirs
+}
+
+do_stage() {
+    autotools_stage_all
+    for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done
+    for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done
+    for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done
+    for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done
+}
+
+do_install_append() {
+    # customising - should rather make this simple upstream
+    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/
+}
+
+FILES_${PN} = "\
+  ${bindir}/* \
+  ${libdir}/enlightenment/modules/*/*.* \
+  ${libdir}/enlightenment/modules/*/*/* \
+  ${libdir}/enlightenment/preload/*.so \
+  ${datadir} \
+  ${sysconfdir} \
+"
+FILES_${PN}-dbg += "\
+  ${libdir}/enlightenment/modules/*/*/.debug/ \
+  ${libdir}/enlightenment/preload/.debug/ \
+"
+
+ALTERNATIVE_PATH = "${bindir}/enlightenment_start"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "16"
diff --git a/packages/e17/edje-editor_cvs.bb b/packages/e17/edje-editor_cvs.bb
index b2483f2bfb..62cda08e14 100644
--- a/packages/e17/edje-editor_cvs.bb
+++ b/packages/e17/edje-editor_cvs.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Edje-Editor is just that."
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 DEPENDS = "etk"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
diff --git a/packages/e17/edje-viewer_cvs.bb b/packages/e17/edje-viewer_cvs.bb
index 88d0df6016..8ffd96992a 100644
--- a/packages/e17/edje-viewer_cvs.bb
+++ b/packages/e17/edje-viewer_cvs.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Edje_Viewer is just that."
 DEPENDS = "etk"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r3"
 
diff --git a/packages/e17/entice_cvs.bb b/packages/e17/entice_cvs.bb
index 62a80ead47..f0a7335d6c 100644
--- a/packages/e17/entice_cvs.bb
+++ b/packages/e17/entice_cvs.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Entice is the E17 picture viewer"
 # can also depend on GIMP for editing
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 DEPENDS = "edb evas ecore edje epsilon esmart"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
diff --git a/packages/e17/entrance_0.9.0.010.bb b/packages/e17/entrance_0.9.0.010.bb
index 4c47f1d2ab..a831a1515b 100644
--- a/packages/e17/entrance_0.9.0.010.bb
+++ b/packages/e17/entrance_0.9.0.010.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Entrance is the Enlightenment login manager"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 # can also use pam and crypt
 DEPENDS = "evas ecore edje esmart bash keylaunch xserver-common login-manager"
 RDEPENDS += "glibc-gconv-iso8859-1 entrance-themes"
diff --git a/packages/e17/examine_cvs.bb b/packages/e17/examine_cvs.bb
index 89d0dd5755..38e062ffa9 100644
--- a/packages/e17/examine_cvs.bb
+++ b/packages/e17/examine_cvs.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Examine, the program configurator"
 DEPENDS = "ewl"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
diff --git a/packages/e17/exhibit_cvs.bb b/packages/e17/exhibit_cvs.bb
index ccf93ded9f..7fdd7449d6 100644
--- a/packages/e17/exhibit_cvs.bb
+++ b/packages/e17/exhibit_cvs.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Exhibit is the ETK picture viewer"
 DEPENDS = "evas ecore epsilon edje eet etk efreet"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb
index 7eae0ea9a4..271ed62d66 100644
--- a/packages/e17/expedite_cvs.bb
+++ b/packages/e17/expedite_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
 DEPENDS = "eet evas"
 RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.6.0+cvs${SRCDATE}"
 PR = "r0"
 
@@ -11,9 +11,25 @@ SRC_URI = "${E_CVS};module=e17/apps/expedite \
            file://hack-disable-opengl.patch;patch=1"
 S = "${WORKDIR}/${PN}"
 
+EXTRA_OECONF = "\
+  --x-includes=${STAGING_INCDIR}/X11 \
+  --x-libraries=${STAGING_LIBDIR} \
+  --enable-simple-x11 \
+\
+  --disable-opengl-glew \
+  --disable-opengl-x11 \
+  --enable-software-x11 \
+  --enable-xrender-x11 \
+  --enable-software-16-x11 \
+  --enable-fb \
+  --disable-software-ddraw \
+  --disable-software-16-ddraw \
+  --disable-direct3d \
+  --disable-software-sdl \
+"
+
 do_configure_append() {
         find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
 }
 
 FILES_${PN} += "${datadir}"
-
diff --git a/packages/e17/rage_0.2.0.005.bb b/packages/e17/rage_0.2.0.005.bb
index e5b5032b10..d2d6c3feae 100644
--- a/packages/e17/rage_0.2.0.005.bb
+++ b/packages/e17/rage_0.2.0.005.bb
@@ -1,11 +1,10 @@
 DESCRIPTION = "Rage is a media center application based on EFL"
 AUTHOR = "Carsten 'The Rasterman' Heitzler"
 HOMEPAGE = "http://www.rasterman.com"
-LICENSE = "GPL"
+LICENSE = "MIT BSD"
 DEPENDS = "evas ecore edje"
 SECTION = "x11/multimedia"
 
 SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/rage-${PV}.tar.gz"
 
 inherit autotools
-
diff --git a/packages/efl1/ecore-native_cvs.bb b/packages/efl1/ecore-native_cvs.bb
index 70d9490b50..52855d99a8 100644
--- a/packages/efl1/ecore-native_cvs.bb
+++ b/packages/efl1/ecore-native_cvs.bb
@@ -1,10 +1,14 @@
 require ecore.inc
 inherit native
 DEPENDS = "eet-native evas-native"
-PR = "r0"
+PR = "r2"
 
 EXTRA_OECONF = "\
+                --x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR} \
+				\
                 --enable-ecore-txt \
+                --disable-ecore-config \
                 --disable-ecore-x-xcb \
                 --disable-ecore-x \
                 --enable-ecore-job \
@@ -12,7 +16,7 @@ EXTRA_OECONF = "\
                 --disable-ecore-sdl \
                 --enable-ecore-fb \
                 --enable-ecore-evas \
-                --disable-ecore-evas-gl \
+                --disable-ecore-evas-x11-gl \
                 --disable-ecore-evas-xrender \
                 --disable-ecore-evas-dfb \
                 --disable-openssl \
@@ -24,6 +28,6 @@ EXTRA_OECONF = "\
                 --disable-poll \
                 --disable-curl \
                 --disable-ecore-desktop \
-                --x-includes=${STAGING_INCDIR}/X11 \
-                --x-libraries=${STAGING_LIBDIR} "
-
+                --disable-ecore-imf \
+                --disable-ecore-imf_evas \
+"
diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb
index 6580957871..cea3d7602d 100644
--- a/packages/efl1/ecore_cvs.bb
+++ b/packages/efl1/ecore_cvs.bb
@@ -1,19 +1,23 @@
 require ecore.inc
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "\
+        --x-includes=${STAGING_INCDIR}/X11 \
+        --x-libraries=${STAGING_LIBDIR} \
+        --enable-simple-x11 \
+\
 		--enable-ecore-txt \
+        --enable-ecore-config \
 		--disable-ecore-x-xcb \
-		--enable-simple-x11 \
 		--enable-ecore-x \
 		--enable-ecore-job \
 		--disable-ecore-directfb \
 		--disable-ecore-sdl \
 		--enable-ecore-fb \
 		--enable-ecore-evas \
-                --disable-ecore-evas-x11-gl \
+        --disable-ecore-evas-x11-gl \
 		--enable-ecore-evas-xrender \
-		--enable-ecore-evas-dfb \
+		--disable-ecore-evas-dfb \
 		--disable-openssl \
 		--enable-abstract-sockets \
 		--enable-ecore-con \
@@ -22,6 +26,5 @@ EXTRA_OECONF = "\
 		--enable-inotify \
 		--disable-poll \
 		--enable-curl \
-		--enable-ecore-desktop \
-		--x-includes=${STAGING_INCDIR}/X11 \
-		--x-libraries=${STAGING_LIBDIR}	"
+		--disable-ecore-desktop \
+"
diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb
index 755efcb9ec..28bcbb1816 100644
--- a/packages/efl1/edbus_cvs.bb
+++ b/packages/efl1/edbus_cvs.bb
@@ -1,18 +1,15 @@
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
 DEPENDS = "dbus ecore"
-LICENSE = "MIT"
-PR = "r1"
+LICENSE = "MIT BSD"
+PR = "r2"
 
 inherit efl_library
 
 SRC_URI = "${E_CVS};module=e17/libs/e_dbus"
 S = "${WORKDIR}/e_dbus"
 
-# TODO increase package granularity
-
 PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal"
 FILES_${PN}-enotify = "${libdir}/libenotify.so.*"
 FILES_${PN}-edbus = "${libdir}/libedbus.so.*"
 FILES_${PN}-enm = "${libdir}/libenm.so.*"
 FILES_${PN}-ehal = "${libdir}/libehal.so.*"
-
diff --git a/packages/efl1/edje-native_cvs.bb b/packages/efl1/edje-native_cvs.bb
index 2c52b69a0c..519476be72 100644
--- a/packages/efl1/edje-native_cvs.bb
+++ b/packages/efl1/edje-native_cvs.bb
@@ -3,7 +3,6 @@ inherit native
 PR = "r0"
 
 DEPENDS = "evas-native ecore-native eet-native embryo-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
 
 do_configure_prepend() {
 	sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb
index 0a5521f929..734dccf56e 100644
--- a/packages/efl1/edje_cvs.bb
+++ b/packages/efl1/edje_cvs.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Edje is a complex graphical design & layout library."
 # can also install vim data files
 DEPENDS = "eet evas ecore embryo edje-native"
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.5.0.41+cvs${SRCDATE}"
-PR = "r0"
+PR = "r2"
 
 inherit efl_library
 
-# NOTE: Packaging needs work. edje_cc should actually be in the -dev package etc.
-
+PACKAGES =+ "${PN}-tools"
+FILES_${PN}-tools = "${bindir}/edje_*"
diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb
index cd12daf245..f2ab6a7408 100644
--- a/packages/efl1/eet_cvs.bb
+++ b/packages/efl1/eet_cvs.bb
@@ -3,8 +3,8 @@ 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."
 DEPENDS = "zlib jpeg"
-LICENSE = "BSD"
+LICENSE = "MIT BSD"
 PV = "0.9.10.041+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit efl_library
diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb
index 3f903d3484..248dadd9bf 100644
--- a/packages/efl1/efreet_cvs.bb
+++ b/packages/efl1/efreet_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "An implementation of freedesktop.org specs for the \
 Enlightenment Foundation Libraries"
 DEPENDS = "ecore"
-LICENSE = "BSD"
+LICENSE = "MIT BSD"
 PV = "0.0.3.003+cvs${SRCDATE}"
 PR = "r0"
 
diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb
index dcba8557a8..15546e206f 100644
--- a/packages/efl1/embryo_cvs.bb
+++ b/packages/efl1/embryo_cvs.bb
@@ -3,8 +3,8 @@ of the Enlightenment project, namely Edje. Embryo's scripting language is based
 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."
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 PV = "0.9.1.041+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit efl_library
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index 0dc8f2d0e8..e05397067b 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -2,9 +2,9 @@ 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."
-LICENSE = "MIT"
+LICENSE = "MIT BSD"
 # can also depend on valgrind, libsdl-x11, directfb
-DEPENDS = "eet freetype jpeg virtual/libx11 libxext libxrender"
+DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender"
 PV = "0.9.9.041+cvs${SRCDATE}"
 
 inherit efl_library
diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb
index 0734967992..d30a03d7c1 100644
--- a/packages/efl1/evas_cvs.bb
+++ b/packages/efl1/evas_cvs.bb
@@ -1,5 +1,5 @@
 require evas.inc
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
@@ -46,15 +46,15 @@ EXTRA_OECONF = "\
 		--disable-convert-16-rgb-444	\
 		--disable-convert-16-rgb-ipq	\
 		--enable-convert-16-rgb-rot-0	\
-		--disable-convert-16-rgb-rot-90	\
+		--enable-convert-16-rgb-rot-90	\
 		--enable-convert-16-rgb-rot-270	\
-		--disable-convert-24-rgb-888	\
-		--disable-convert-24-bgr-888	\
-		--disable-convert-32-rgb-8888	\
-		--disable-convert-32-rgbx-8888	\
-		--disable-convert-32-bgr-8888	\
-		--disable-convert-32-bgrx-8888	\
-		--disable-convert-32-rgb-rot-0	\
-		--disable-convert-32-rgb-rot-90	\
-		--disable-convert-32-rgb-rot-270"
+		--enable-convert-24-rgb-888	\
+		--enable-convert-24-bgr-888	\
+		--enable-convert-32-rgb-8888	\
+		--enable-convert-32-rgbx-8888	\
+		--enable-convert-32-bgr-8888	\
+		--enable-convert-32-bgrx-8888	\
+		--enable-convert-32-rgb-rot-0	\
+		--enable-convert-32-rgb-rot-90	\
+		--enable-convert-32-rgb-rot-270"