11 files changed, 29 insertions, 60 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/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
-