merge of 9382a38f6527ac52dbb3b04c1ccd0854c14c1e5c

     and cfbd36ce13c068634dfe838d6e4d7e1980011a9b

5 files changed, 80 insertions, 3 deletions

diff --git a/packages/e17/e-utils_20050810.bb b/packages/e17/e-utils_20050810.bb
new file mode 100644
index 0000000000..273c7622e6
--- /dev/null
+++ b/packages/e17/e-utils_20050810.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Enlightenment Window Manager Utilities"
+DEPENDS = "freetype eet evas-x11 ecore-x11 edje engrave esmart epsilon ewl imlib2-x11 e17"
+LICENSE = "MIT"
+SECTION = "e/apps"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+CVSDATE = "${PV}"
+PR = "r0"
+
+inherit autotools
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_utils"
+S = "${WORKDIR}/e_utils"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index 6e0934274b..afc0e82825 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -12,7 +12,5 @@ S = "${WORKDIR}/entrance"
 
 inherit autotools
 
-# EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
-
-PARALLEL_MAKE = ""
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
diff --git a/packages/efl/engrave_20050810.bb b/packages/efl/engrave_20050810.bb
new file mode 100644
index 0000000000..13e68259a9
--- /dev/null
+++ b/packages/efl/engrave_20050810.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Engrave is an Edje Editing Library"
+LICENSE = "MIT"
+DEPENDS = "jpeg edb ecore-x11 evas-x11 edje imlib2-x11"
+
+inherit efl
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/engrave"
+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/.mtn2git_empty b/packages/efl/evas/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/efl/evas/.mtn2git_empty
diff --git a/packages/efl/evas/fix-configure.patch b/packages/efl/evas/fix-configure.patch
new file mode 100644
index 0000000000..cc7462e72c
--- /dev/null
+++ b/packages/efl/evas/fix-configure.patch
@@ -0,0 +1,49 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- evas-0.9.9.013/configure.in~fix-configure
++++ evas-0.9.9.013/configure.in
+@@ -157,9 +157,7 @@
+     [
+       AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true)
+       AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
+-      x_dir=${x_dir:-/usr/X11R6}
+-      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+-      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++      x_libs="-lX11 -lXext";
+       ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load"
+     ],
+     [
+@@ -221,7 +219,7 @@
+         X11/X.h,
+         [AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, true)
+          AC_DEFINE(BUILD_ENGINE_SOFTWARE_XCB, 1, [Software XCB Rendering Backend])
+-         xcb_dir=${x_dir:-/usr/X11R6}
++         xcb_dir=${x_dir:-}
+          xcb_cflags="${x_cflags:--I${x_includes:-$x_dir/include}} $XCB_CFLAGS $XCB_ICCCM_CFLAGS"
+          xcb_libs="${x_libs:--L${x_libraries:-$x_dir/lib}}  $XCB_LIBS $XCB_ICCCM_LIBS"
+          ENGINE_SOFTWARE_XCB_PRG="evas_software_xcb_test evas_software_xcb_perf_test evas_software_xcb_perf_load"],
+@@ -433,10 +431,10 @@
+ 	  AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
+ 	  AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true)
+ 	  AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
+-	  x_dir=${x_dir:-/usr/X11R6};
++	  x_dir=${x_dir:-};
+ 	  x_cflags=${x_cflags:--I$x_dir/include}
+ 	  x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
+-	  gl_cflags="-I/usr/include"
++	  gl_cflags=""
+ 	  gl_libs="-lGL -lGLU -lpthread"
+ 	  gl_dir=""
+ 	  ENGINE_GL_X11_PRG="evas_gl_x11_test"
+@@ -490,7 +488,7 @@
+       AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
+       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true)
+       AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
+-      x_dir="/usr/X11R6";
++      x_dir="";
+       x_cflags="-I"$x_dir"/include"
+       x_libs="-L"$x_dir"/lib -lX11 -lXext"
+       ENGINE_CAIRO_X11_PRG="evas_cairo_x11_test"