efl: edje and ecore no longer need imlib2 (yay!)

6 files changed, 20 insertions, 39 deletions

diff --git a/packages/efl/edje-native_0.5.0.025.bb b/packages/efl/edje-native_0.5.0.025.bb
index 5e7bed336d..5eb077922a 100644
--- a/packages/efl/edje-native_0.5.0.025.bb
+++ b/packages/efl/edje-native_0.5.0.025.bb
@@ -1,22 +1,18 @@
 include edje_${PV}.bb
-PR = "r2"
-
-REAL_TARGET_SYS := ${TARGET_SYS}
+PR = "r3"
 
 inherit native
-DEPENDS = "evas-native ecore-native eet-native embryo-native imlib2-native"
+
+DEPENDS = "evas-native ecore-native eet-native embryo-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
 
 EXTRA_OECONF = "--with-evas-config=${STAGING_BINDIR}/evas-config-native	\
   --with-ecore-config=${STAGING_BINDIR}/ecore-config-native	\
   --with-eet-config=${STAGING_BINDIR}/eet-config-native		\
-  --with-embryo-config=${STAGING_BINDIR}/embryo-config-native	\
-  --with-imlib2-config=${STAGING_BINDIR}/imlib2-config-native	"
+  --with-embryo-config=${STAGING_BINDIR}/embryo-config-native"
 
 do_configure_prepend() {
-        sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
-#	sed -i 's:/usr/bin/cpp:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-cpp:' ${S}/src/bin/edje_cc_parse.c
-#	sed -i 's:/usr/bin/gcc:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-gcc:' ${S}/src/bin/edje_cc_parse.c
+	sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
 	sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c
 	sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c
 }
diff --git a/packages/efl/edje_0.5.0.025.bb b/packages/efl/edje_0.5.0.025.bb
index 0d4acab003..d51dd119e4 100644
--- a/packages/efl/edje_0.5.0.025.bb
+++ b/packages/efl/edje_0.5.0.025.bb
@@ -1,8 +1,8 @@
 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"
+DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native"
 LICENSE = "MIT"
-PR = "r6"
+PR = "r7"
 
 ## package.bbclass kills packages when there are duplicates, this means
 ##  that efl.bbclass can't have PACKAGES += and so the FILES for previous
@@ -14,16 +14,19 @@ PR = "r6"
 
 inherit efl
 
-FILES_${PN}-examples = "${datadir}/edje/data/images ${datadir}/edje/data/src ${datadir}/edje/data/test ${datadir}/edje/data/*.sh"
-
-FILES_${SRCNAME}-themes = ""
-
 SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101"
 
-LEAD_SONAME = "libedje.so"
-
 do_configure_prepend() {
 	install -d "${S}/m4"
 	install "${WORKDIR}/m4/"*.m4 "${S}/m4"
 	aclocal -I m4
 }
+
+LEAD_SONAME = "libedje.so"
+
+FILES_${PN}-examples = "${datadir}/edje/data/images \
+                        ${datadir}/edje/data/src \
+                        ${datadir}/edje/data/test \
+                        ${datadir}/edje/data/*.sh"
+
+FILES_${SRCNAME}-themes = ""
diff --git a/packages/efl/engrave_20060128.bb b/packages/efl/engrave_20060128.bb
deleted file mode 100644
index 63eb24eb1f..0000000000
--- a/packages/efl/engrave_20060128.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Engrave is an Edje Editing Library"
-LICENSE = "MIT"
-# also requires yacc and lex on host
-DEPENDS = "virtual/evas virtual/ecore"
-
-inherit efl
-
-SRC_URI = "${E_CVS};module=e17/libs/engrave;date=${PV}"
-S = "${WORKDIR}/engrave"
-
-do_stage_append() {
-	for i in src/lib/engrave*.h
-	do
-		install -m 0644 $i ${STAGING_INCDIR}
-	done
-}
-
diff --git a/packages/efl/evas-fb_0.9.9.025.bb b/packages/efl/evas-fb_0.9.9.025.bb
index df49075839..3f7847874c 100644
--- a/packages/efl/evas-fb_0.9.9.025.bb
+++ b/packages/efl/evas-fb_0.9.9.025.bb
@@ -1,6 +1,5 @@
 include evas.inc
-DEPENDS = "freetype libpng jpeg eet"
-PR = "r4"
+PR = "r5"
 
 EXTRA_OECONF = "--enable-fb         \
 		--disable-directfb          \
diff --git a/packages/efl/evas-x11_0.9.9.025.bb b/packages/efl/evas-x11_0.9.9.025.bb
index 3dea60c25f..e130923816 100644
--- a/packages/efl/evas-x11_0.9.9.025.bb
+++ b/packages/efl/evas-x11_0.9.9.025.bb
@@ -1,6 +1,6 @@
 include evas.inc
-DEPENDS += "libx11 libxext freetype"
-PR = "r6"
+DEPENDS += "edb libx11 libxext freetype"
+PR = "r7"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 582e7c3b20..07574daa38 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -4,7 +4,7 @@ down to using normal X11 primitives such as pixmaps, lines and rectangles if \
 your CPU or graphics hardware are too slow."
 LICENSE = "MIT"
 # can also depend on valgrind (?)
-DEPENDS = "freetype libpng jpeg eet edb"
+DEPENDS = "freetype libpng jpeg eet"
 PROVIDES += "virtual/evas"
 
 inherit efl