merge of 52ebd988f59f6be0851649e3d117ae3734e87b4f

     and ab5c1cdb1ec2745a8a648c55a1738863c84ce2a6

12 files changed, 117 insertions, 110 deletions

diff --git a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh
index cf144272ec..63e984d7f6 100644
--- a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh
+++ b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh
@@ -2,26 +2,26 @@
 
 setVar() {
     if [ ! "$value" = "" ]; then
-	    name=`echo "$name" | sed 'y:-\[\]:_____:'`
-	    value=`echo "$value" | sed 's:":\\\":g'`
-	    export $name="$value"
+        name=`echo "$name" | sed 'y:-\[\]:_____:'`
+        value=`echo "$value" | sed 's:":\\\":g'`
+        export $name="$value"
     fi
 }
 
 #convert true/false to 1/0
 bool() {
     if [ ! "$1" = "" ]; then
-	if [ "$1" = "True" ]; then
-	    cmd="$cmd $2 1"
-	else
-	    cmd="$cmd $2 0"
-	fi
+        if [ "$1" = "True" ]; then
+            cmd="$cmd $2 1"
+        else
+            cmd="$cmd $2 0"
+        fi
     fi
 }
 
 str() {
     if [ ! "$1" = "" ]; then
-	cmd="$cmd $2 \"$1"\"
+        cmd="$cmd $2 \"$1"\"
     fi
 }
 
@@ -29,30 +29,30 @@ convert_desktop_to_eap() {
     echo "Converting $1 to $2"
     for l in `cat $1`; do
         #on empty line clear vars
-	if [ "$l" = "" ]; then
-
-	    #grab previous var if it exists
-	    setVar
-
-	    name=""
-	    value=""
-	else
-	    #if an = is in the line it's a name/value pair
-	    if echo "$l" | grep -q "="; then
-
-	        #grab previous var if it exists
-		setVar
-
-		name=`echo "$l" | cut -d "=" -f 1`
-		value=`echo "$l" | cut -d "=" -f 2-`
-	    else
-
-	        #if previous value assume this is a continuation
-		if [ ! "$value" = "" ]; then
-		    value="$value $l"
-		fi
-	    fi
-	fi
+        if [ "$l" = "" ]; then
+
+            #grab previous var if it exists
+            setVar
+
+            name=""
+            value=""
+        else
+            #if an = is in the line it's a name/value pair
+            if echo "$l" | grep -q "="; then
+
+                #grab previous var if it exists
+                setVar
+
+                name=`echo "$l" | cut -d "=" -f 1`
+                value=`echo "$l" | cut -d "=" -f 2-`
+            else
+
+                #if previous value assume this is a continuation
+                if [ ! "$value" = "" ]; then
+                    value="$value $l"
+                fi
+            fi
+        fi
     done
     setVar
 
@@ -70,66 +70,67 @@ convert_desktop_to_eap() {
         ##enlightenment_eapp | grep -- -set- | cut -d " " -f 3 | xargs -iCMD enlightenment_eapp gpe-othello.eap CMD \"\"
         #enlightenment_eapp gpe-othello.eap -del-all
 
-	cat <<EOF > /tmp/gpeEap.edc
+        cat <<EOF > /tmp/gpeEap.edc
 images {
     image: "$Icon" COMP;
 }
 collections {
     group {
-	name: "icon";
-	max: 48 48;
-	parts {
-	    part {
-		name: "image";
-		mouse_events: 0;
-		description {
-		    state: "default" 0.0;
-		    aspect: 1.0 1.0;
-		    image.normal: "$Icon";
-		}
-	    }
-	}
+        name: "icon";
+        max: 48 48;
+        parts {
+            part {
+                name: "image";
+                mouse_events: 0;
+                description {
+                    state: "default" 0.0;
+                    aspect: 1.0 1.0;
+                    image.normal: "$Icon";
+                }
+            }
+        }
     }
 }
 EOF
 
-	edje_cc --image_dir /usr/share/pixmaps /tmp/gpeEap.edc "$PATH_TO_EAP/$2"
-	rm /tmp/gpeEap.edc
+        edje_cc --image_dir "$PATH_TO_PIXMAPS" /tmp/gpeEap.edc "$PATH_TO_EAP/$2"
+        rm /tmp/gpeEap.edc
 
-	cmd="enlightenment_eapp \"$PATH_TO_EAP/$2\" $cmd"
+        cmd="enlightenment_eapp \"$PATH_TO_EAP/$2\" $cmd"
 
         #pipe command in sh to allow it to re-interpret quotes
-	echo $cmd | /bin/sh -s
-
-	if `echo "$Categories" | grep -q "SystemSettings"`; then
-	    dir="Settings"
-	elif `echo "$Categories" | grep -q "PIM"`; then
-	    dir="PIM"
-	elif `echo "$Categories" | grep -q "Network"`; then
-	    dir="Network"
-	elif `echo "$Categories" | grep -q "Games"`; then
-	    dir="Games"
-	elif `echo "$Categories" | grep -q "Game"`; then
-	    dir="Games"
-	elif `echo "$Categories" | grep -q "AudioVideo"`; then
-	    dir="Multimedia"
-	elif `echo "$Categories" | grep -q "Panel"`; then
-	    dir="Utility/Panel"
-	elif `echo "$Categories" | grep -q "Utility"`; then
-	    dir="Utlity"
-	else
-	    dir=""
-	fi
-
-	#dir=`echo "$Categories" | sed 'y:;:/:'`
-	mkdir -p "$PATH_TO_E_GPE/$dir"
-	echo "$2" >> "$PATH_TO_E_GPE/$dir"/.order
+        echo $cmd | /bin/sh -s
+
+        if `echo "$Categories" | grep -q "SystemSettings"`; then
+            dir="Settings"
+        elif `echo "$Categories" | grep -q "PIM"`; then
+            dir="PIM"
+        elif `echo "$Categories" | grep -q "Network"`; then
+            dir="Network"
+        elif `echo "$Categories" | grep -q "Games"`; then
+            dir="Games"
+        elif `echo "$Categories" | grep -q "Game"`; then
+            dir="Games"
+        elif `echo "$Categories" | grep -q "AudioVideo"`; then
+            dir="Multimedia"
+        elif `echo "$Categories" | grep -q "Panel"`; then
+            dir="Utility/Panel"
+        elif `echo "$Categories" | grep -q "Utility"`; then
+            dir="Utlity"
+        else
+            dir=""
+        fi
+
+        #dir=`echo "$Categories" | sed 'y:;:/:'`
+        mkdir -p "$PATH_TO_E_GPE/$dir"
+        echo "$2" >> "$PATH_TO_E_GPE/$dir"/.order
     fi
 }
 
-PATH_TO_DESKTOP="${IMAGE_ROOTFS}/usr/share/applications"
-PATH_TO_EAP="${IMAGE_ROOTFS}/home/root/.e/e/applications/all"
-PATH_TO_E_GPE="${IMAGE_ROOTFS}/home/root/.e/e/applications/favorite/GPE"
+PATH_TO_DESKTOP="/usr/share/applications"
+PATH_TO_PIXMAPS="/usr/share/pixmaps"
+PATH_TO_EAP="/home/root/.e/e/applications/all"
+PATH_TO_E_GPE="/home/root/.e/e/applications/favorite/GPE"
 
 if [ ! -d $PATH_TO_E_GPE ]; then
     mkdir -p $PATH_TO_E_GPE
diff --git a/packages/e17/e17-gpe-menu-convert_0.2.bb b/packages/e17/e17-gpe-menu-convert_0.2.bb
index b83cba6209..fd55d34915 100644
--- a/packages/e17/e17-gpe-menu-convert_0.2.bb
+++ b/packages/e17/e17-gpe-menu-convert_0.2.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "Shell script to convert GPE .desktop files into e17 eap files and menus"
 DEPENDS = "edje e-wm"
-RDEPENDS += "edje-utils e-wm"
+#RDEPENDS += "edje-utils e-wm"
+RDEPENDS += "libedje-dev e-wm"
 LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "file://e17-gpe-menu-convert.sh"
 
@@ -13,6 +14,6 @@ do_install() {
 	install -m 755 ${WORKDIR}/e17-gpe-menu-convert.sh ${D}/usr/bin/e17-gpe-menu-convert.sh
 }
 
-pkg_postinst() {
-	/usr/bin/e17-gpe-menu-convert.sh 2>&1 > /tmp/gpe-menu-convert.log
-}
\ No newline at end of file
+#pkg_postinst() {
+#	/usr/bin/e17-gpe-menu-convert.sh
+#}
\ No newline at end of file
diff --git a/packages/efl/e_0.16.999.023.bb b/packages/efl/e_0.16.999.023.bb
index 35bb776269..0f400d51cc 100644
--- a/packages/efl/e_0.16.999.023.bb
+++ b/packages/efl/e_0.16.999.023.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Enlightenment Window Mananger Library"
 DEPENDS = "virtual/evas virtual/ecore edje eet embryo"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 
 inherit efl
 
diff --git a/packages/efl/ecore-x11_0.9.9.023.bb b/packages/efl/ecore-x11_0.9.9.023.bb
index 0927b59e03..40527561aa 100644
--- a/packages/efl/ecore-x11_0.9.9.023.bb
+++ b/packages/efl/ecore-x11_0.9.9.023.bb
@@ -1,6 +1,6 @@
 include ecore.inc
 DEPENDS += "evas-x11"
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://evas-x11-include.patch;patch=1"
 
diff --git a/packages/efl/edb_1.0.5.005.bb b/packages/efl/edb_1.0.5.005.bb
index 620b39d301..5550538afb 100644
--- a/packages/efl/edb_1.0.5.005.bb
+++ b/packages/efl/edb_1.0.5.005.bb
@@ -2,11 +2,14 @@ DESCRIPTION = "EDB is a database convenience library wrapped around the \
 Berkeley DB 2.7.7 by Sleepycat Software."
 DEPENDS = "zlib ncurses"
 LICENSE = "BSD"
-PR = "r2"
+PR = "r3"
 
-PACKAGES = "edb-utils"
-FILES_edb-utils = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed"
-RDEPENDS_edb-utils += "ncurses"
+## package.bbclass kills packages when there are duplicates, this means
+##  that efl.bbclass can't have PACKAGES += and so the FILES for previous
+##  packages take precedence over -utils
+#PACKAGES = "edb-utils"
+#FILES_edb-utils = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed"
+#RDEPENDS_edb-utils += "ncurses"
 
 inherit efl
 
diff --git a/packages/efl/edje_0.5.0.023.bb b/packages/efl/edje_0.5.0.023.bb
index b0fbda0acb..11662b226a 100644
--- a/packages/efl/edje_0.5.0.023.bb
+++ b/packages/efl/edje_0.5.0.023.bb
@@ -2,14 +2,20 @@ DESCRIPTION = "Edje is a complex graphical design & layout library."
 # can also install vim data files
 DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2"
 LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
 
-PACKAGES = "edje-utils"
-FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include"
-RDEPENDS_edje-utils += "embryo-utils cpp"
+## package.bbclass kills packages when there are duplicates, this means
+##  that efl.bbclass can't have PACKAGES += and so the FILES for previous
+##  packages take precedence over -utils
+#PACKAGES = "edje-utils"
+#RPROVIDES_edje-utils += "libedje-utils"
+#FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include"
+#RDEPENDS_edje-utils += "libembryo-utils cpp cpp-symlinks gcc gcc-symlinks"
 
 inherit efl
 
+RDEPENDS_${PN}-dev += "libembryo-dev cpp cpp-symlinks gcc gcc-symlinks"
+
 FILES_${SRCNAME}-themes = ""
 
 SRC_URI += "cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101"
diff --git a/packages/efl/eet_0.9.10.023.bb b/packages/efl/eet_0.9.10.023.bb
index c0f89b1064..6e6032e098 100644
--- a/packages/efl/eet_0.9.10.023.bb
+++ b/packages/efl/eet_0.9.10.023.bb
@@ -4,6 +4,6 @@ each chunk (very much like a zip file) and allow fast \
 random-access reading of the file later on."
 DEPENDS = "zlib jpeg"
 LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
 
 inherit efl
diff --git a/packages/efl/embryo_0.9.1.023.bb b/packages/efl/embryo_0.9.1.023.bb
index f5582ef9c2..603a0c8b47 100644
--- a/packages/efl/embryo_0.9.1.023.bb
+++ b/packages/efl/embryo_0.9.1.023.bb
@@ -4,9 +4,12 @@ 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"
-PR = "r2"
+PR = "r3"
 
-PACKAGES = "embryo-utils"
-FILES_embryo-utils = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include"
+## package.bbclass kills packages when there are duplicates, this means
+##  that efl.bbclass can't have PACKAGES += and so the FILES for previous
+##  packages take precedence over -utils
+#PACKAGES = "embryo-utils"
+#FILES_embryo-utils = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include"
 
 inherit efl
diff --git a/packages/efl/evas-x11_0.9.9.023.bb b/packages/efl/evas-x11_0.9.9.023.bb
index 75a080a26c..ba8b74aae2 100644
--- a/packages/efl/evas-x11_0.9.9.023.bb
+++ b/packages/efl/evas-x11_0.9.9.023.bb
@@ -1,12 +1,12 @@
 include evas.inc
 DEPENDS += "x11 xext freetype"
-PR = "r3"
+PR = "r4"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
 		--enable-fb			\
 		--disable-directfb		\
-		--disable-buffer		\
+		--enable-buffer			\
 		--disable-software-qtopia	\
 		--enable-software-x11		\
 		--disable-gl-x11		\
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 37f0efaab1..a8b4e85f4f 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -29,13 +29,5 @@ do_configure_prepend() {
 	fi
 }
 
-do_configure () {
-	autotools_do_configure
-	#find ${S} -type f | xargs sed -i 's:@FREETYPE_CFLAGS@:-I${STAGING_INCDIR}/freetype2:'
-	#find ${S} -name Makefile | xargs sed -i 's:--tag=CC:-lfreetype --tag=CC:'
-}
-
-
 headers = "<override me>"
-libraries = "libevas"
-
+libraries = "libevas"
\ No newline at end of file
diff --git a/packages/efl/imlib2-x11_1.2.1.010.bb b/packages/efl/imlib2-x11_1.2.1.010.bb
index 165321355c..d13d24165a 100644
--- a/packages/efl/imlib2-x11_1.2.1.010.bb
+++ b/packages/efl/imlib2-x11_1.2.1.010.bb
@@ -1,5 +1,6 @@
 include imlib2.inc
 DEPENDS += "x11 xext"
+PR = "r1"
 
 EXTRA_OECONF = "--disable-mmx \
                 --with-x \
diff --git a/packages/meta/task-e-x11.bb b/packages/meta/task-e-x11.bb
index 00b233e81c..0854cfd43a 100644
--- a/packages/meta/task-e-x11.bb
+++ b/packages/meta/task-e-x11.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for Enlightenment/X11"
 PACKAGES = "task-e-x11-core task-e-x11"
 PROVIDES = "task-e-x11-core task-e-x11"
-PR = "r7"
+PR = "r8"
 
 FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
               e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
@@ -14,7 +14,7 @@ ALLOW_EMPTY = 1
 # X
 #
 RDEPENDS_task-e-x11-core = "rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
-                            ttf-bitstream-vera chkhinge"
+                            ttf-bitstream-vera chkhinge gpe-bootsplash-theme-e"
 
 #
 # E-core